Merge tag 'android-5.1.1_r1' into aosp-5.1

Android 5.1.1 release 1
F-AOSP · Apr 21, 2015 · 1421199 · 1421199
2 parents 78f70b1 + 47ca8fb
commit 1421199
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/java/com/android/internal/telephony/PhoneBase.java b/src/java/com/android/internal/telephony/PhoneBase.java
@@ -425,7 +425,13 @@ protected PhoneBase(String name, PhoneNotifier notifier, Context context, Comman
         mUiccController = UiccController.getInstance();
         mUiccController.registerForIccChanged(this, EVENT_ICC_CHANGED, null);
 
-        // Monitor IMS service
+        // Monitor IMS service - but first poll to see if already up (could miss
+        // intent)
+        ImsManager imsManager = ImsManager.getInstance(mContext, getPhoneId());
+        if (imsManager != null && imsManager.isServiceAvailable()) {
+            mImsServiceReady = true;
+            updateImsPhone();
+        }
         IntentFilter filter = new IntentFilter();
         filter.addAction(ImsManager.ACTION_IMS_SERVICE_UP);
         filter.addAction(ImsManager.ACTION_IMS_SERVICE_DOWN);