diff options
author | Brad Ebinger <breadley@google.com> | 2018-06-06 17:08:53 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-06-06 17:08:53 -0700 |
commit | 61e71d322bb831d8841c3c3822e2cf7f60f4f2ab (patch) | |
tree | 33c171a1c8ca973f04d9d4a913862afaefd4f9da | |
parent | aa8c7a7d4b4de4b67923756c7e2f143a1311a8ae (diff) | |
parent | b84d40e2c61275a9effe5191ba6e598cd5c7a9b4 (diff) | |
download | ims-61e71d322bb831d8841c3c3822e2cf7f60f4f2ab.tar.gz |
Make sure the mBinder is not null before clearing listener
am: b84d40e2c6
Change-Id: I6010710f758b90b91e5c67764c74b90bf0cb6b39
-rw-r--r-- | src/java/com/android/ims/MmTelFeatureConnection.java | 6 |
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!"); } |