[RCS UCE] Upate to call the API RcsUceAdapter#addOnPublishStateChangedListener instead to listen to the Publish state changed am: 9a61e50fde am: 133a806e2e am: f7dc4bcdfb

Original change: https://android-review.googlesource.com/c/platform/external/ims/+/1546814

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I84d8b8ccf43e85741a9075a223ef25e4f3a45e4a

1 files changed, 16 insertions, 16 deletions

diff --git a/rcs/presencepolling/src/com/android/service/ims/presence/CapabilityPolling.java b/rcs/presencepolling/src/com/android/service/ims/presence/CapabilityPolling.java
index 7bd8fff..17099aa 100644
--- a/rcs/presencepolling/src/com/android/service/ims/presence/CapabilityPolling.java
+++ b/rcs/presencepolling/src/com/android/service/ims/presence/CapabilityPolling.java
@@ -65,6 +65,10 @@ public class CapabilityPolling {
     private Logger logger = Logger.getLogger(this.getClass().getName());
     private final Context mContext;
 
+    private static final String PERSIST_SERVICE_NAME =
+        "com.android.service.ims.presence.PersistService";
+    private static final String PERSIST_SERVICE_PACKAGE = "com.android.service.ims.presence";
+
     public static final String ACTION_PERIODICAL_DISCOVERY_ALARM =
             "com.android.service.ims.presence.periodical_capability_discovery";
     private PendingIntent mDiscoveryAlarmIntent = null;
@@ -130,29 +134,25 @@ public class CapabilityPolling {
         }
     };
 
-    private RcsUceAdapter.PublishStateCallback mPublishStateCallback =
-            new RcsUceAdapter.PublishStateCallback() {
-        private static final String PERSIST_SERVICE_NAME =
-                "com.android.service.ims.presence.PersistService";
-        private static final String PERSIST_SERVICE_PACKAGE = "com.android.service.ims.presence";
-
+    private RcsUceAdapter.OnPublishStateChangedListener mPublishStateCallback =
+            new RcsUceAdapter.OnPublishStateChangedListener() {
         @Override
-        public void onChanged(int publishState) {
+        public void onPublishStateChange(int publishState) {
             logger.info("publish state changed: " + publishState);
             Intent intent = new Intent(RcsPresence.ACTION_PUBLISH_STATE_CHANGED);
             intent.putExtra(RcsPresence.EXTRA_PUBLISH_STATE, publishState);
             mContext.sendStickyBroadcast(intent);
             launchPersistService(intent);
         }
-
-        private void launchPersistService(Intent intent) {
-            ComponentName component = new ComponentName(PERSIST_SERVICE_PACKAGE,
-                    PERSIST_SERVICE_NAME);
-            intent.setComponent(component);
-            mContext.startService(intent);
-        }
     };
 
+    private void launchPersistService(Intent intent) {
+        ComponentName component = new ComponentName(PERSIST_SERVICE_PACKAGE,
+            PERSIST_SERVICE_NAME);
+        intent.setComponent(component);
+        mContext.startService(intent);
+    }
+
     private Runnable mRegisterCallbackRunnable = this::tryProvisioningManagerRegistration;
 
     private static CapabilityPolling sInstance = null;
@@ -286,7 +286,7 @@ public class CapabilityPolling {
             ImsManager imsManager =
                     (ImsManager) mContext.getSystemService(Context.TELEPHONY_IMS_SERVICE);
             RcsUceAdapter uceAdapter = imsManager.getImsRcsManager(mDefaultSubId).getUceAdapter();
-            uceAdapter.registerPublishStateCallback(mContext.getMainExecutor(),
+            uceAdapter.addOnPublishStateChangedListener(mContext.getMainExecutor(),
                     mPublishStateCallback);
         } catch (Exception ex) {
             logger.warn("register publish state callback failed, exception: " + ex);
@@ -298,7 +298,7 @@ public class CapabilityPolling {
             ImsManager imsManager =
                     (ImsManager) mContext.getSystemService(Context.TELEPHONY_IMS_SERVICE);
             RcsUceAdapter uceAdapter = imsManager.getImsRcsManager(mDefaultSubId).getUceAdapter();
-            uceAdapter.unregisterPublishStateCallback(mPublishStateCallback);
+            uceAdapter.removeOnPublishStateChangedListener(mPublishStateCallback);
         } catch (Exception ex) {
             logger.warn("unregister publish state callback failed, exception: " + ex);
         }