diff options
| author | James.cf Lin <jamescflin@google.com> | 2021-01-26 11:19:25 +0800 |
|---|---|---|
| committer | James.cf Lin <jamescflin@google.com> | 2021-01-28 03:08:14 +0800 |
| commit | 792e2bf359406e21e681fb4c49c9f27f2a644ce8 (patch) | |
| tree | 5030396e2c8aff54e05ff95e9575142f56961923 | |
| parent | 9a61e50fde66498ef44c780e3096a5252ed18344 (diff) | |
| download | ims-792e2bf359406e21e681fb4c49c9f27f2a644ce8.tar.gz | |
[RCS UCE] The UCE APIs are changed, update to call the new APIs
bug: 174656329
Test: atest -c CtsTelephonyTestCases:android.telephony.ims.cts.ImsServiceTest
Change-Id: Ie0668fb1719c399bd6c00ea68da6f974302cbe77
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 19ea492..c34bfde 100644 --- a/rcs/rcsservice/src/com/android/service/ims/RcsStackAdaptor.java +++ b/rcs/rcsservice/src/com/android/service/ims/RcsStackAdaptor.java @@ -418,7 +418,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(); @@ -430,7 +430,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 dd9684d..692ad0a 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, |