commit b2c02637c8ab6fa1ee296aa90c3fa18bcd2aa6b0
author Bart Sears <bsears@google.com> Wed Mar 04 01:55:53 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 04 01:55:53 2015 +0000
tree 0b1caaf73ace1e43b329485191c49f15cb72d6fb
parent 73876a17e45f57e36013eeffc1cac61e6cb12482
parent af857af442d52ffdfeaff1d6d13473d00272a231

Merge "Lightweight fix for incorrect locale changes - DO NOT MERGE" into lmp-mr1-dev

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

diff --git a/src/java/com/android/internal/telephony/PhoneBase.java b/src/java/com/android/internal/telephony/PhoneBase.java
index ce69689..e1444ee 100644
--- a/src/java/com/android/internal/telephony/PhoneBase.java
+++ b/src/java/com/android/internal/telephony/PhoneBase.java
@@ -425,7 +425,13 @@
         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);