diff options
| author | Brad Ebinger <breadley@google.com> | 2020-01-22 17:35:17 -0800 |
|---|---|---|
| committer | Brad Ebinger <breadley@google.com> | 2020-01-27 09:25:21 -0800 |
| commit | c91fe8f1affee16f4478240cedfd3a941f355e62 (patch) | |
| tree | 36d4c8797a2c5858a7c6f6cab0b8be1284d0bb08 | |
| parent | a3d2c5aa9e5ba89017d132617de90cc14b08f985 (diff) | |
| download | ims-c91fe8f1affee16f4478240cedfd3a941f355e62.tar.gz | |
Better support requesting capabilites in PresenceSubscriberandroid-r-preview-1
Need to add request ID to response for tracking in telephony.
Bug: 111305845
Test: atest CtsTelephonyTestCases:RcsUceAdapterTest
Merged-In: I3c68e852af1f0df98778619efd9c219aef374b4c
Change-Id: I3c68e852af1f0df98778619efd9c219aef374b4c
3 files changed, 4 insertions, 4 deletions
diff --git a/rcs/rcsservice/src/com/android/service/ims/RcsService.java b/rcs/rcsservice/src/com/android/service/ims/RcsService.java index 7c0cea1..cbd4a8b 100644 --- a/rcs/rcsservice/src/com/android/service/ims/RcsService.java +++ b/rcs/rcsservice/src/com/android/service/ims/RcsService.java @@ -168,8 +168,8 @@ public class RcsService extends Service { } @Override - public void onCapabilitiesUpdated(List<RcsContactUceCapability> contactCapabilities, - boolean updateLastTimestamp) { + public void onCapabilitiesUpdated(int reqId, + List<RcsContactUceCapability> contactCapabilities, boolean updateLastTimestamp) { ArrayList<RcsPresenceInfo> presenceInfoList = contactCapabilities.stream().map( PresenceInfoParser::getRcsPresenceInfo).collect( Collectors.toCollection(ArrayList::new)); diff --git a/rcs/rcsservice/src/com/android/service/ims/presence/ContactCapabilityResponse.java b/rcs/rcsservice/src/com/android/service/ims/presence/ContactCapabilityResponse.java index 5eb3154..64fe076 100644 --- a/rcs/rcsservice/src/com/android/service/ims/presence/ContactCapabilityResponse.java +++ b/rcs/rcsservice/src/com/android/service/ims/presence/ContactCapabilityResponse.java @@ -75,6 +75,6 @@ public interface ContactCapabilityResponse { * Called when there is an update to the capabilities from the network. On error, the * capabilities will also be updates as not capable. */ - void onCapabilitiesUpdated(List<RcsContactUceCapability> contactCapabilities, + void onCapabilitiesUpdated(int reqId, List<RcsContactUceCapability> contactCapabilities, boolean updateLastTimestamp); } diff --git a/rcs/rcsservice/src/com/android/service/ims/presence/PresenceSubscriber.java b/rcs/rcsservice/src/com/android/service/ims/presence/PresenceSubscriber.java index 4be4e96..e7b1269 100644 --- a/rcs/rcsservice/src/com/android/service/ims/presence/PresenceSubscriber.java +++ b/rcs/rcsservice/src/com/android/service/ims/presence/PresenceSubscriber.java @@ -457,7 +457,7 @@ public class PresenceSubscriber extends PresenceBase { logger.warn("handleCapabilityUpdate, invalid listener!"); return; } - task.mListener.onCapabilitiesUpdated(capabilities, updateLastTimestamp); + task.mListener.onCapabilitiesUpdated(task.mTaskId, capabilities, updateLastTimestamp); } public void retryToGetAvailability() { |