From 35a6054b0055e0f2c13aa4d370e139976656dbf4 Mon Sep 17 00:00:00 2001
From: Hyunho <hhshin@google.com>
Date: Fri, 18 Feb 2022 05:22:00 +0000
Subject: 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
---
 .../android/ims/rcs/uce/presence/publish/DeviceCapabilityInfo.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/java')

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:
-- 
cgit v1.2.3