diff options
author | Brad Ebinger <breadley@google.com> | 2018-02-23 23:24:57 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-02-23 23:24:57 +0000 |
commit | 8a978bc045d5f7e9de8719f96990bdf0dd3e16ae (patch) | |
tree | 1940af467b0ad11b90314ddfec2af09b582c6b09 | |
parent | 47a60445e3e05b78b6bb8491ad1e63611e4d895d (diff) | |
parent | f3fef2c76d8ea01fc29d4e4f5d020ad2b4f288ea (diff) | |
download | ims-8a978bc045d5f7e9de8719f96990bdf0dd3e16ae.tar.gz |
Merge "Destroys the Presence Service when service is down." am: c84ae57fd0 am: e1c915a2a4
am: f3fef2c76d
Change-Id: I75af1fbb751e556161b8625628f1863eddaee02b
-rw-r--r-- | rcs/rcsservice/src/com/android/service/ims/RcsStackAdaptor.java | 12 |
1 files changed, 12 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 151809f..6f1a076 100644 --- a/rcs/rcsservice/src/com/android/service/ims/RcsStackAdaptor.java +++ b/rcs/rcsservice/src/com/android/service/ims/RcsStackAdaptor.java @@ -709,6 +709,18 @@ public class RcsStackAdaptor{ private void clearImsUceService() { synchronized (mSyncObj) { + try { + logger.info("clearImsUceService: removing listener and presence service."); + if (mStackPresService != null) { + mStackPresService.removeListener(mStackPresenceServiceHandle, + mListenerHandle); + } + if (mStackService != null) { + mStackService.destroyPresenceService(mStackPresenceServiceHandle); + } + } catch (RemoteException e) { + logger.warn("clearImsUceService: Couldn't clean up stack service"); + } mImsUceManager = null; mStackService = null; mStackPresService = null; |