diff options
| author | Bill Yi <byi@google.com> | 2018-10-19 12:20:24 -0700 |
|---|---|---|
| committer | Bill Yi <byi@google.com> | 2018-10-19 12:20:24 -0700 |
| commit | fd1da0802649885bf835813269fb719aa7b107b7 (patch) | |
| tree | 3820a0196a65f58730c9c3b60f04d96e56622745 | |
| parent | d739e134e9d456ab202e315b3bc04afce6db0bf2 (diff) | |
| parent | d329e815244c26c8586b746f14988bf9406b4028 (diff) | |
| download | ims-fd1da0802649885bf835813269fb719aa7b107b7.tar.gz | |
Merge pi-dr1-dev to aosp-master
Change-Id: I17916816e701feb26dcfa36fed3474f174cbedbf
| -rw-r--r-- | rcs/rcsservice/src/com/android/service/ims/RcsStackAdaptor.java | 8 |
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 { |