Better support requesting capabilites in PresenceSubscriber
Need to add request ID to response for tracking in telephony.
Bug: 111305845
Test: atest CtsTelephonyTestCases:RcsUceAdapterTest
Merged-In: I3c68e852af1f0df98778619efd9c219aef374b4c
Change-Id: I3c68e852af1f0df98778619efd9c219aef374b4c
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 @@
}
@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 @@
* 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 @@
logger.warn("handleCapabilityUpdate, invalid listener!");
return;
}
- task.mListener.onCapabilitiesUpdated(capabilities, updateLastTimestamp);
+ task.mListener.onCapabilitiesUpdated(task.mTaskId, capabilities, updateLastTimestamp);
}
public void retryToGetAvailability() {
