diff options
author | Brad Ebinger <breadley@google.com> | 2017-02-28 23:00:30 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-02-28 23:00:30 +0000 |
commit | 44bc69bca87dcee6947d37fa674789f2b3dc64d4 (patch) | |
tree | 9e65f6002448cafa6fa89cbef46cae97c8f19ffb | |
parent | c3948acec44be29aa3000f00ccb1d757bf5f42dd (diff) | |
parent | b9f48fb60cee0ae9541494a51c4b6fd1b97aab0d (diff) | |
download | ims-44bc69bca87dcee6947d37fa674789f2b3dc64d4.tar.gz |
Remove the sending of IMS_SERVICE_UP/_DOWN from ImsManager am: 7c40cd0d3e am: c42e5d82a7
am: b9f48fb60c
Change-Id: I196598adcbfa581106f8366b6fadd95b224aabd8
-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 c57b4418..bc3e0334 100644 --- a/src/java/com/android/ims/ImsManager.java +++ b/src/java/com/android/ims/ImsManager.java @@ -892,33 +892,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. */ @@ -1489,15 +1466,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); } @@ -1635,12 +1603,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)); - } } } |