diff options
| author | James.cf Lin <jamescflin@google.com> | 2021-01-28 21:14:08 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-28 21:14:08 +0000 |
| commit | 57e914e22235ec96f509830fca04b087eb9b9932 (patch) | |
| tree | e43e0499522473e14882afa712f648da70cca505 | |
| parent | 5a0e064b6370348a266727d54949532d58491301 (diff) | |
| parent | 177938183c4957b70822faaedf7006087a0f5a7b (diff) | |
| download | ims-57e914e22235ec96f509830fca04b087eb9b9932.tar.gz | |
[RCS UCE] The UCE APIs are changed, update to call the new APIs am: 792e2bf359 am: ec0a7753f8 am: 177938183c
Original change: https://android-review.googlesource.com/c/platform/external/ims/+/1557101
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibdf3665c27299cad0b7254ef8c228cdfd6b94203
3 files changed, 6 insertions, 6 deletions
diff --git a/rcs/rcsservice/src/com/android/service/ims/PresenceInfoParser.java b/rcs/rcsservice/src/com/android/service/ims/PresenceInfoParser.java index 5daa051..dac1401 100644 --- a/rcs/rcsservice/src/com/android/service/ims/PresenceInfoParser.java +++ b/rcs/rcsservice/src/com/android/service/ims/PresenceInfoParser.java @@ -296,7 +296,7 @@ public class PresenceInfoParser{ RcsContactPresenceTuple.Builder tupleBuilder = new RcsContactPresenceTuple.Builder( RcsContactPresenceTuple.TUPLE_BASIC_STATUS_OPEN, RcsContactPresenceTuple.SERVICE_ID_MMTEL, "1.0"); - tupleBuilder.addContactUri(contactUri).addServiceCapabilities(servCapsBuilder.build()); + tupleBuilder.setContactUri(contactUri).setServiceCapabilities(servCapsBuilder.build()); PresenceBuilder presenceBuilder = new PresenceBuilder(contactUri, RcsContactUceCapability.SOURCE_TYPE_CACHED, @@ -309,7 +309,7 @@ public class PresenceInfoParser{ public static RcsPresenceInfo getRcsPresenceInfo(RcsContactUceCapability capability) { int volteCapable = ServiceState.OFFLINE; int vtCapable = ServiceState.OFFLINE; - RcsContactPresenceTuple presenceTuple = capability.getPresenceTuple( + RcsContactPresenceTuple presenceTuple = capability.getCapabilityTuple( RcsContactPresenceTuple.SERVICE_ID_MMTEL); if (presenceTuple != null) { ServiceCapabilities serviceCaps = presenceTuple.getServiceCapabilities(); diff --git a/rcs/rcsservice/src/com/android/service/ims/RcsStackAdaptor.java b/rcs/rcsservice/src/com/android/service/ims/RcsStackAdaptor.java index d032000..239ebaa 100644 --- a/rcs/rcsservice/src/com/android/service/ims/RcsStackAdaptor.java +++ b/rcs/rcsservice/src/com/android/service/ims/RcsStackAdaptor.java @@ -420,7 +420,7 @@ public class RcsStackAdaptor implements PresencePublisher, SubscribePublisher { } private boolean isVolteSupported(RcsContactUceCapability capabilities) { - RcsContactPresenceTuple presenceTuple = capabilities.getPresenceTuple( + RcsContactPresenceTuple presenceTuple = capabilities.getCapabilityTuple( RcsContactPresenceTuple.SERVICE_ID_MMTEL); if (presenceTuple != null) { ServiceCapabilities serviceCaps = presenceTuple.getServiceCapabilities(); @@ -432,7 +432,7 @@ public class RcsStackAdaptor implements PresencePublisher, SubscribePublisher { } private boolean isVtSupported(RcsContactUceCapability capabilities) { - RcsContactPresenceTuple presenceTuple = capabilities.getPresenceTuple( + RcsContactPresenceTuple presenceTuple = capabilities.getCapabilityTuple( RcsContactPresenceTuple.SERVICE_ID_MMTEL); if (presenceTuple != null) { ServiceCapabilities serviceCaps = presenceTuple.getServiceCapabilities(); diff --git a/rcs/rcsservice/src/com/android/service/ims/presence/PresencePublication.java b/rcs/rcsservice/src/com/android/service/ims/presence/PresencePublication.java index 4327606..29391f7 100644 --- a/rcs/rcsservice/src/com/android/service/ims/presence/PresencePublication.java +++ b/rcs/rcsservice/src/com/android/service/ims/presence/PresencePublication.java @@ -941,8 +941,8 @@ public class PresencePublication extends PresenceBase { RcsContactPresenceTuple.Builder tupleBuilder = new RcsContactPresenceTuple.Builder( RcsContactPresenceTuple.TUPLE_BASIC_STATUS_OPEN, RcsContactPresenceTuple.SERVICE_ID_MMTEL, "1.0"); - tupleBuilder.addContactUri(contact) - .addServiceCapabilities(servCapsBuilder.build()); + tupleBuilder.setContactUri(contact) + .setServiceCapabilities(servCapsBuilder.build()); PresenceBuilder presenceBuilder = new PresenceBuilder(contact, RcsContactUceCapability.SOURCE_TYPE_CACHED, |