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

Commit af944446 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

Change-Id: I29dbc3f00c8a6625d53d47ecec840c0a8f22058b
parents cf8617d5 2c9a5b9f

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");