Reconnect when ImsService binder instance is null am: ff0979256d

am: ab749c4181

Change-Id: I34795af5a91fdb114611ad70d175f6b680546e03

1 files changed, 18 insertions, 5 deletions

diff --git a/src/java/com/android/ims/ImsManager.java b/src/java/com/android/ims/ImsManager.java
index 080c372c..7cb192cb 100644
--- a/src/java/com/android/ims/ImsManager.java
+++ b/src/java/com/android/ims/ImsManager.java
@@ -228,7 +228,12 @@ public class ImsManager {
     public static ImsManager getInstance(Context context, int phoneId) {
         synchronized (sImsManagerInstances) {
             if (sImsManagerInstances.containsKey(phoneId)) {
-                return sImsManagerInstances.get(phoneId);
+                ImsManager m = sImsManagerInstances.get(phoneId);
+                // May be null for some tests
+                if (m != null) {
+                    m.connectIfServiceIsAvailable();
+                }
+                return m;
             }
 
             ImsManager mgr = new ImsManager(context, phoneId);
@@ -1428,16 +1433,24 @@ public class ImsManager {
     }
 
     /*
-     * Returns a flag indicating whether the IMS service is available.
+     * Returns a flag indicating whether the IMS service is available. If it is not available,
+     * it will try to connect before reporting failure.
      */
     public boolean isServiceAvailable() {
-        if (mImsServiceProxy == null) {
-            createImsService();
-        }
+        connectIfServiceIsAvailable();
         // mImsServiceProxy will always create an ImsServiceProxy.
         return mImsServiceProxy.isBinderAlive();
     }
 
+    /**
+     * If the service is available, try to reconnect.
+     */
+    public void connectIfServiceIsAvailable() {
+        if (mImsServiceProxy == null || !mImsServiceProxy.isBinderAlive()) {
+            createImsService();
+        }
+    }
+
     public void setImsConfigListener(ImsConfigListener listener) {
         mImsConfigListener = listener;
     }