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

Commit c3b96dc0 authored by Grace Jia's avatar Grace Jia Committed by android-build-merger
Browse files

Merge "Modified ImsServiceController.java to catch NullPointerException when... 

Merge "Modified ImsServiceController.java to catch NullPointerException when trying to unbind ims service." am: a5fbb5dd am: 2c9a5b9f am: af944446
am: 082f5ecf

Change-Id: I51423d93e0eb37b96a6be790f6ffd2209ee7e27c
parents 784a23f4 082f5ecf

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

+4 −2
Original line number Diff line number Diff line
@@ -115,9 +115,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");