commit 73876a17e45f57e36013eeffc1cac61e6cb12482
author Etan Cohen <etancohen@google.com> Thu Feb 26 17:47:54 2015 -0800
committer Etan Cohen <etancohen@google.com> Mon Mar 02 15:42:16 2015 -0800
tree de26d895d3fb1545923caadf348ade65631a400e
parent 1d92343e63ca13bcc215d93377afe341f84a280e

IMS phone instantiation: add polling on base phone creation

Phone registers for notification of IMS service up and down. However,
there may be a race condition which causes the phone to be created after
the intents are alrady sent. Add polling in addition to listening to
broadcast intent.

Bug: 19447972
Change-Id: I0e12118bb11a22161cf2f389b9ca6f39442202e1

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);