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

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

Fix ImsManager NPE encountered during GTS testing am: fcd9bdc8 

am: fa9f5de3

Change-Id: Ifea0e015b70cbf4648a9abc70dc99ce9d3f0d250
parents fa78c9d5 fa9f5de3

src/java/com/android/ims/ImsManager.java

+11 −8
Original line number Diff line number Diff line
@@ -332,16 +332,19 @@ public class ImsManager { 


        private void retryGetImsService() {

            synchronized (mLock) {

                if (mImsManager != null) {

                    // remove callback so we do not receive updates from old ImsServiceProxy when

                    // switching between ImsServices.

                    mImsManager.removeNotifyStatusChangedCallback(mNotifyStatusChangedCallback);

                    //Leave mImsManager as null, then CallStateException will be thrown when dialing

                    mImsManager = null;

                }



                // Exponential backoff during retry, limited to 32 seconds.

                removeCallbacks(mGetServiceRunnable);

                postDelayed(mGetServiceRunnable, mRetryTimeout.get());

            }

        }



        private void getImsService() throws ImsException {

            synchronized (mLock) {