commit 23916134059344b22fc52eaf9cec2f6cc3edee07
author Brad Ebinger <breadley@google.com> Fri Apr 06 09:37:50 2018 -0700
committer Brad Ebinger <breadley@google.com> Fri Apr 06 09:37:50 2018 -0700
tree 911146a7b8b304928d7f9450f4bad3c8ef260795
parent b8cd44005f3529ffac188ca80f3b5b02e6432009

Make sure the mBinder is not null before clearing listener

Bug: 77693258
Test: Unit Tests/GTS Tests
Change-Id: I85bae2f073960b81ba0afe791138d2765a7f4ed6

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!");
         }