commit 129b42af2b04a39da53df8da5031526c9a432cc8
author android-build-team Robot <android-build-team-robot@google.com> Thu Aug 10 07:25:49 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Thu Aug 10 07:25:49 2017 +0000
tree 017c0649b10037a1541f48c9c3a47fbaf1647be5
parent 5295d565a5dad01db8d085944f7d74f2acc4bc8e
parent 9cdc5a79b32c4158499d640a254891ac2b1d3250

release-request-7f84484c-eec6-4577-8d5a-55079be4f3c5-for-git_oc-mr1-release-4262309 snap-temp-L02100000091441105

Change-Id: Icc0960019b053d8a8bf8e45da7b89fa0a988a02f

rcs/rcsservice/src/com/android/service/ims/RcsService.java

diff --git a/rcs/rcsservice/src/com/android/service/ims/RcsService.java b/rcs/rcsservice/src/com/android/service/ims/RcsService.java
index 53ba728..aeccb30 100644
--- a/rcs/rcsservice/src/com/android/service/ims/RcsService.java
+++ b/rcs/rcsservice/src/com/android/service/ims/RcsService.java
@@ -61,6 +61,8 @@
 import com.android.ims.RcsPresence.PublishState;
 
 import com.android.ims.internal.Logger;
+import com.android.internal.telephony.IccCardConstants;
+import com.android.internal.telephony.TelephonyIntents;
 import com.android.service.ims.RcsStackAdaptor;
 
 import com.android.service.ims.presence.PresencePublication;
@@ -115,8 +117,6 @@
                 Settings.Global.getUriFor(Settings.Global.VT_IMS_ENABLED),
                 false, mVtSettingObserver);
 
-        registerImsConnectionStateListener();
-
         mReceiver = new BroadcastReceiver() {
             @Override
             public void onReceive(Context context, Intent intent) {
@@ -127,6 +127,11 @@
                 } else if(ImsManager.ACTION_IMS_SERVICE_DOWN.equalsIgnoreCase(
                         intent.getAction())){
                     handleImsServiceDown();
+                } else if(TelephonyIntents.ACTION_SIM_STATE_CHANGED.equalsIgnoreCase(
+                        intent.getAction())) {
+                    String stateExtra = intent.getStringExtra(
+                            IccCardConstants.INTENT_KEY_ICC_STATE);
+                    handleSimStateChanged(stateExtra);
                 }
             }
         };
@@ -134,6 +139,7 @@
         IntentFilter statusFilter = new IntentFilter();
         statusFilter.addAction(ImsManager.ACTION_IMS_SERVICE_UP);
         statusFilter.addAction(ImsManager.ACTION_IMS_SERVICE_DOWN);
+        statusFilter.addAction(TelephonyIntents.ACTION_SIM_STATE_CHANGED);
         registerReceiver(mReceiver, statusFilter);
     }
 
@@ -151,6 +157,14 @@
         }
     }
 
+    public void handleSimStateChanged(String state) {
+
+        if(IccCardConstants.INTENT_VALUE_ICC_LOADED.equalsIgnoreCase(state)) {
+            // ImsManager depends on a loaded SIM to get the default Voice Registration.
+            registerImsConnectionStateListener();
+        }
+    }
+
 
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
@@ -358,8 +372,7 @@
             ImsManager imsManager = ImsManager.getInstance(this,
                     SubscriptionManager.getDefaultVoicePhoneId());
             if (imsManager != null) {
-                imsManager.addRegistrationListener(ImsServiceClass.MMTEL,
-                        mImsConnectionStateListener);
+                imsManager.addRegistrationListener(mImsConnectionStateListener);
             }
         } catch (ImsException e) {
             logger.error("addRegistrationListener exception=", e);