aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Ebinger <breadley@google.com>2018-04-06 09:37:50 -0700
committerBrad Ebinger <breadley@google.com>2018-06-06 14:24:45 -0700
commitb84d40e2c61275a9effe5191ba6e598cd5c7a9b4 (patch)
tree33c171a1c8ca973f04d9d4a913862afaefd4f9da
parentd0423bf7082a06ceed7744bf65f07937df318994 (diff)
downloadims-b84d40e2c61275a9effe5191ba6e598cd5c7a9b4.tar.gz
Make sure the mBinder is not null before clearing listenerandroid-n-iot-release-polk-at1
Bug: 77693258 Test: Unit Tests/GTS Tests Merged-In: I485bbd0a6d4f2ba550911d5c4a55eb9936ac7981 Change-Id: I85bae2f073960b81ba0afe791138d2765a7f4ed6
-rw-r--r--src/java/com/android/ims/MmTelFeatureConnection.java6
1 files changed, 5 insertions, 1 deletions
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!");
}