diff options
author | Brad Ebinger <breadley@google.com> | 2017-02-28 22:55:57 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-02-28 22:55:57 +0000 |
commit | b9f48fb60cee0ae9541494a51c4b6fd1b97aab0d (patch) | |
tree | c222f3bf91564572824e8c1cc024f4b04747f488 | |
parent | 126dabe57449fff57a6186b113c14711e2ca2076 (diff) | |
parent | c42e5d82a70ee2fff1b363ed36035d2605ebd195 (diff) | |
download | ims-b9f48fb60cee0ae9541494a51c4b6fd1b97aab0d.tar.gz |
Remove the sending of IMS_SERVICE_UP/_DOWN from ImsManager am: 7c40cd0d3e
am: c42e5d82a7
Change-Id: I69d9086f12df489ce697a9fe8ad5cb1fad826519
-rw-r--r-- | src/java/com/android/ims/ImsManager.java | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/src/java/com/android/ims/ImsManager.java b/src/java/com/android/ims/ImsManager.java index 96debae6..9e0407ea 100644 --- a/src/java/com/android/ims/ImsManager.java +++ b/src/java/com/android/ims/ImsManager.java @@ -891,33 +891,10 @@ public class ImsManager { mPhoneId = phoneId; mConfigDynamicBind = mContext.getResources().getBoolean( com.android.internal.R.bool.config_dynamic_bind_ims); - addNotifyStatusChangedCallback(this::sendImsServiceIntent); createImsService(); } /** - * Provide backwards compatibility using deprecated service UP/DOWN intents. - */ - private void sendImsServiceIntent() { - int status = mImsServiceProxy.getFeatureStatus(); - Intent intent; - switch (status) { - case ImsFeature.STATE_NOT_AVAILABLE: - case ImsFeature.STATE_INITIALIZING: - intent = new Intent(ACTION_IMS_SERVICE_DOWN); - break; - case ImsFeature.STATE_READY: - intent = new Intent(ACTION_IMS_SERVICE_UP); - break; - default: - intent = new Intent(ACTION_IMS_SERVICE_DOWN); - } - intent.putExtra(EXTRA_PHONE_ID, mPhoneId); - mContext.sendBroadcast(new Intent(intent)); - } - - - /** * @return Whether or not ImsManager is configured to Dynamically bind or not to support legacy * devices. */ @@ -1488,15 +1465,6 @@ public class ImsManager { ImsServiceProxy.INotifyStatusChanged::notifyStatusChanged)); // Trigger the cache to be updated for feature status. serviceProxy.getFeatureStatus(); - // In order to keep backwards compatibility with other services such as RcsService, - // we must broadcast the IMS_SERVICE_UP intent here. If it is not ready, IMS_SERVICE_UP - // will be called in this::sendImsServiceIntent. IMS_SERVICE_UP is sent by ImsService - // in the old ImsService implementation. - if (serviceProxy.isBinderAlive()) { - Intent intent = new Intent(ACTION_IMS_SERVICE_UP); - intent.putExtra(EXTRA_PHONE_ID, mPhoneId); - mContext.sendBroadcast(new Intent(intent)); - } } else { Rlog.w(TAG, "getServiceProxy: b is null! Phone Id: " + mPhoneId); } @@ -1634,12 +1602,6 @@ public class ImsManager { mConfig = null; mEcbm = null; mMultiEndpoint = null; - - if (mContext != null && !isDynamicBinding()) { - Intent intent = new Intent(ACTION_IMS_SERVICE_DOWN); - intent.putExtra(EXTRA_PHONE_ID, mPhoneId); - mContext.sendBroadcast(new Intent(intent)); - } } } |