diff options
author | James.cf Lin <jamescflin@google.com> | 2021-01-12 04:06:12 +0800 |
---|---|---|
committer | James.cf Lin <jamescflin@google.com> | 2021-01-12 04:06:12 +0800 |
commit | 9a61e50fde66498ef44c780e3096a5252ed18344 (patch) | |
tree | ef1a655e1efbc3bb60445b35172b5a36bf57666d | |
parent | bec021845da7c8f657740e259a50d8a947825cd8 (diff) | |
download | ims-9a61e50fde66498ef44c780e3096a5252ed18344.tar.gz |
[RCS UCE] Upate to call the API RcsUceAdapter#addOnPublishStateChangedListener instead to listen to the Publish state changed
The API to register publish state is changed. Upate to call the new API
bug: 174187744
Test: atest -c CtsTelephonyTestCases:android.telephony.ims.cts.ImsServiceTest
Change-Id: If2f39983d899397789e04f151573da864b5bb306
-rw-r--r-- | rcs/presencepolling/src/com/android/service/ims/presence/CapabilityPolling.java | 32 |
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 87b0dd0..947b7bc 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; @@ -129,29 +133,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; @@ -285,7 +285,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); @@ -297,7 +297,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); } |