commit d19254796aecde8bab0f4b7beb7b3b2a0b3de721
author android-build-team Robot <android-build-team-robot@google.com> Sun Apr 08 07:21:39 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Sun Apr 08 07:21:39 2018 +0000
tree 911146a7b8b304928d7f9450f4bad3c8ef260795
parent cee1e021ae37ab4167e59e4d4edbadb965241a18
parent 23916134059344b22fc52eaf9cec2f6cc3edee07

Snap for 4706961 from 23916134059344b22fc52eaf9cec2f6cc3edee07 to pi-release

Change-Id: Id52bffd39fea383fabe4d8b7c90d4ba376224312

src/java/com/android/ims/MmTelFeatureConnection.java

diff --git a/src/java/com/android/ims/MmTelFeatureConnection.java b/src/java/com/android/ims/MmTelFeatureConnection.java
index de8f928..b2472c8 100644
--- a/src/java/com/android/ims/MmTelFeatureConnection.java
+++ b/src/java/com/android/ims/MmTelFeatureConnection.java
@@ -451,7 +451,11 @@
         mRegistrationCallbackManager.close();
         mCapabilityCallbackManager.close();
         try {
-            getServiceInterface(mBinder).setListener(null);
+            synchronized (mLock) {
+                if (isBinderAlive()) {
+                    getServiceInterface(mBinder).setListener(null);
+                }
+            }
         } catch (RemoteException e) {
             Log.w(TAG, "closeConnection: couldn't remove listener!");
         }