commit b07bb3ea93cacd17d32cf58657c781cf3c0f33fb
author Pavel Zhamaitsiak <pavelz@google.com> Tue Sep 22 13:30:07 2015 -0700
committer Pavel Zhamaitsiak <pavelz@google.com> Tue Sep 22 13:30:07 2015 -0700
tree 0d5e5219e0b098a5c2ea0c65d049c68028db1321
parent 1138cd35542d36e50ee4744a27d07da1ecae61e9

Register for intent CARRIER_CONFIG_CHANGED when PhoneProxy is created

We rely on this intent to trigger IMS config update.

Bug: 24270744
Change-Id: I69494c5269352ed6afa567661752b484918c4b6b

src/java/com/android/internal/telephony/PhoneProxy.java

diff --git a/src/java/com/android/internal/telephony/PhoneProxy.java b/src/java/com/android/internal/telephony/PhoneProxy.java
index 1076d05..87d0357 100644
--- a/src/java/com/android/internal/telephony/PhoneProxy.java
+++ b/src/java/com/android/internal/telephony/PhoneProxy.java
@@ -83,7 +83,6 @@
     private int mPhoneId = 0;
 
     private Context mContext;
-    private boolean mPhoneProxyReceiverRegistered = false;
     private BroadcastReceiver mPhoneProxyReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
@@ -121,6 +120,9 @@
         } else if (phone.getPhoneType() == PhoneConstants.PHONE_TYPE_CDMA) {
             mIccCardProxy.setVoiceRadioTech(ServiceState.RIL_RADIO_TECHNOLOGY_1xRTT);
         }
+
+        mContext.registerReceiver(mPhoneProxyReceiver, new IntentFilter(
+                CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED));
     }
 
     @Override
@@ -335,13 +337,6 @@
                 mActivePhone.acquireOwnershipOfImsPhone(imsPhone);
             }
             mActivePhone.startMonitoringImsService();
-
-            if (!mPhoneProxyReceiverRegistered) {
-                IntentFilter filter = new IntentFilter();
-                filter.addAction(CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED);
-                mContext.registerReceiver(mPhoneProxyReceiver, filter);
-                mPhoneProxyReceiverRegistered = true;
-            }
         }
 
         if (oldPhone != null) {
@@ -1390,10 +1385,7 @@
         mCommandsInterface.unregisterForOn(this);
         mCommandsInterface.unregisterForVoiceRadioTechChanged(this);
         mCommandsInterface.unregisterForRilConnected(this);
-        if (mPhoneProxyReceiverRegistered) {
-            mContext.unregisterReceiver(mPhoneProxyReceiver);
-            mPhoneProxyReceiverRegistered = false;
-        }
+        mContext.unregisterReceiver(mPhoneProxyReceiver);
     }
 
     @Override