Perform a retry if creating the presence service failsandroid-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-devpie-b4s4-releasepie-b4s4-dev

If the service handle's value is < 0, perform a retry instead
of blocking indefinitely.

Bug: 109782868
Test: Add contacts and make sure device publishes status and
retrieves capabilities.

Change-Id: I54f52b54a30f49c0834963df76a42d89a6e589bf

1 files changed, 8 insertions, 0 deletions

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 @@ public class RcsStackAdaptor{
                     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 {