diff options
author | Brad Ebinger <breadley@google.com> | 2018-04-06 09:37:50 -0700 |
---|---|---|
committer | Brad Ebinger <breadley@google.com> | 2018-04-06 09:37:50 -0700 |
commit | 23916134059344b22fc52eaf9cec2f6cc3edee07 (patch) | |
tree | 911146a7b8b304928d7f9450f4bad3c8ef260795 | |
parent | b8cd44005f3529ffac188ca80f3b5b02e6432009 (diff) | |
download | ims-23916134059344b22fc52eaf9cec2f6cc3edee07.tar.gz |
Make sure the mBinder is not null before clearing listener
Bug: 77693258
Test: Unit Tests/GTS Tests
Change-Id: I85bae2f073960b81ba0afe791138d2765a7f4ed6
-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!"); } |