commit e468c08de889f099bf3b5046f0963b17ce562f60
author Sundong Ahn <sundongahn@google.com> Wed Jul 18 00:17:26 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed Jul 18 00:17:26 2018 -0700
tree 3820a0196a65f58730c9c3b60f04d96e56622745
parent 89e8ad05d146211bd3a5312e3c23e619d0f97d14
parent b14564f3b3ae7ac429680a8c38fae3bcf9dc0067

Build com.android.ims.rcsmanager with static library am: 2236205ce0
am: b14564f3b3

Change-Id: I166451fc55dbe9390b338dc95cef22c50bcd5f7d

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

diff --git a/rcs/rcsservice/src/com/android/service/ims/RcsStackAdaptor.java b/rcs/rcsservice/src/com/android/service/ims/RcsStackAdaptor.java
index 6f1a076..bd0f89c 100644
--- a/rcs/rcsservice/src/com/android/service/ims/RcsStackAdaptor.java
+++ b/rcs/rcsservice/src/com/android/service/ims/RcsStackAdaptor.java
@@ -565,6 +565,14 @@
                     logger.debug("Create PresService");
                     mStackPresenceServiceHandle = mStackService.createPresenceService(
                             mListenerHandler.mPresenceListener, mListenerHandle);
+                    // If the service handle is -1, then creating the service failed somehow.
+                    // schedule a retry.
+                    if (mStackPresenceServiceHandle < 0) {
+                        logger.error("initAllService : service handle < 0, retrying...");
+                        mIsIniting = false;
+                        mLastInitSubService = -1;
+                        return ret;
+                    }
                     mStackPresService = mStackService.getPresenceService();
                     ret = 0;
                  } else {