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

Commit 90bbaa3e authored by Grace Jia's avatar Grace Jia
Browse files

Modified ImsServiceController.java to catch NullPointerException when 

trying to unbind ims service.

Test: atest com.android.internal.telephony.ims.ImsServiceControllerTest
Bug: 141472114
Change-Id: I928444eb55e7636ad200559ee10f9efbe63b07bb
parent e3a49e5c

src/java/com/android/internal/telephony/ims/ImsServiceController.java

+4 −2
Original line number Diff line number Diff line
@@ -114,9 +114,11 @@ public class ImsServiceController { 
                mIsBinding = false;

                mIsBound = false;

            }

            cleanupConnection();

            if (mImsServiceConnection != null) {

                // according to the docs, we should fully unbind before rebinding again.

                mContext.unbindService(mImsServiceConnection);

            }

            cleanupConnection();

            Log.w(LOG_TAG, "ImsService(" + name + "): onBindingDied. Starting rebind...");

            startDelayedRebindToService();

            mLocalLog.log("onBindingDied, retrying in " + mBackoff.getCurrentDelay() + " mS");