commit c84ae57fd0564666a10ec8c975eb827b77706ebe
author Brad Ebinger <breadley@google.com> Fri Feb 23 22:57:29 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Feb 23 22:57:29 2018 +0000
tree 1940af467b0ad11b90314ddfec2af09b582c6b09
parent 5288bc0d58c27f81b750f6949ef0b3821727c7b6
parent 3ea793302fed57895659104fc8438e0e3ad44467

Merge "Destroys the Presence Service when service is down."

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 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 @@
 
     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;