Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8a43453 authored by Brad Ebinger's avatar Brad Ebinger Committed by android-build-merger
Browse files

Make sure the mBinder is not null before clearing listener 

am: 23916134

Change-Id: I485bbd0a6d4f2ba550911d5c4a55eb9936ac7981
parents ac194d1f 23916134

src/java/com/android/ims/MmTelFeatureConnection.java

+5 −1
Original line number Original line Diff line number Diff line
@@ -451,7 +451,11 @@ public class MmTelFeatureConnection { 
        mRegistrationCallbackManager.close();

        mRegistrationCallbackManager.close();

        mCapabilityCallbackManager.close();

        mCapabilityCallbackManager.close();

        try {

        try {

            synchronized (mLock) {

                if (isBinderAlive()) {

                    getServiceInterface(mBinder).setListener(null);

                    getServiceInterface(mBinder).setListener(null);

                }

            }

        } catch (RemoteException e) {

        } catch (RemoteException e) {

            Log.w(TAG, "closeConnection: couldn't remove listener!");

            Log.w(TAG, "closeConnection: couldn't remove listener!");

        }

        }