aboutsummaryrefslogtreecommitdiff
path: root/src/java
diff options
context:
space:
mode:
authorHyunho <hhshin@google.com>2022-02-18 05:22:00 +0000
committerHyunho <hhshin@google.com>2022-02-18 17:17:02 +0000
commit35a6054b0055e0f2c13aa4d370e139976656dbf4 (patch)
tree5415b8be9767e7ecfcfbfcfb661aa5997f7b363e /src/java
parent1035afff32a6027028a9c935822668b59aa8ae4c (diff)
downloadims-35a6054b0055e0f2c13aa4d370e139976656dbf4.tar.gz
Set mPendingPublicCapabilities to the currently registered service description
If getDeviceCapabilities() is called when mechanism is PRESENCE, set mPendingPublicCapabilities to the currently registered service description. Test: atest DeviceCapabilityInfoTest Bug: b/220236505 Change-Id: Icaf0b7430879f295e9981821180d311c2e14a535 Merged-In: Icaf0b7430879f295e9981821180d311c2e14a535
Diffstat (limited to 'src/java')
-rw-r--r--src/java/com/android/ims/rcs/uce/presence/publish/DeviceCapabilityInfo.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/java/com/android/ims/rcs/uce/presence/publish/DeviceCapabilityInfo.java b/src/java/com/android/ims/rcs/uce/presence/publish/DeviceCapabilityInfo.java
index 8de8b01f..b7bdd9d6 100644
--- a/src/java/com/android/ims/rcs/uce/presence/publish/DeviceCapabilityInfo.java
+++ b/src/java/com/android/ims/rcs/uce/presence/publish/DeviceCapabilityInfo.java
@@ -520,7 +520,12 @@ public class DeviceCapabilityInfo {
@CapabilityMechanism int mechanism, Context context) {
switch (mechanism) {
case RcsContactUceCapability.CAPABILITY_MECHANISM_PRESENCE:
- return getPresenceCapabilities(context);
+ RcsContactUceCapability rcsContactUceCapability = getPresenceCapabilities(context);
+ if (rcsContactUceCapability != null) {
+ mPendingPublishCapabilities =
+ mServiceCapRegTracker.copyRegistrationCapabilities();
+ }
+ return rcsContactUceCapability;
case RcsContactUceCapability.CAPABILITY_MECHANISM_OPTIONS:
return getOptionsCapabilities(context);
default: