From b84d40e2c61275a9effe5191ba6e598cd5c7a9b4 Mon Sep 17 00:00:00 2001
From: Brad Ebinger <breadley@google.com>
Date: Fri, 6 Apr 2018 09:37:50 -0700
Subject: Make sure the mBinder is not null before clearing listener

Bug: 77693258
Test: Unit Tests/GTS Tests
Merged-In: I485bbd0a6d4f2ba550911d5c4a55eb9936ac7981
Change-Id: I85bae2f073960b81ba0afe791138d2765a7f4ed6
---
 src/java/com/android/ims/MmTelFeatureConnection.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/java/com/android/ims/MmTelFeatureConnection.java b/src/java/com/android/ims/MmTelFeatureConnection.java
index de8f9282..b2472c8a 100644
--- a/src/java/com/android/ims/MmTelFeatureConnection.java
+++ b/src/java/com/android/ims/MmTelFeatureConnection.java
@@ -451,7 +451,11 @@ public class MmTelFeatureConnection {
         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!");
         }
-- 
cgit v1.2.3