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

Commit af6dfc4b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Settings: Fix exception in about phone during SIM swap" am: 16503cf5 am: e40251b9 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1344083

Change-Id: I32affa3deffca49e15bdeb9792bb995c00cb58f6
parents 69605d12 e40251b9

src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java

+12 −0
Original line number Diff line number Diff line
@@ -152,6 +152,7 @@ public class SimStatusDialogController implements LifecycleObserver, OnResume, O 
    private final Context mContext;



    private boolean mShowLatestAreaInfo;

    private boolean mIsRegisteredListener = false;



    private final BroadcastReceiver mAreaInfoReceiver = new BroadcastReceiver() {

        @Override
@@ -282,11 +283,22 @@ public class SimStatusDialogController implements LifecycleObserver, OnResume, O 
            mContext.registerReceiver(mAreaInfoReceiver,

                    new IntentFilter(CellBroadcastIntents.ACTION_AREA_INFO_UPDATED));

        }



        mIsRegisteredListener = true;

    }



    @Override

    public void onPause() {

        if (mSubscriptionInfo == null) {

            if (mIsRegisteredListener) {

                mSubscriptionManager.removeOnSubscriptionsChangedListener(

                        mOnSubscriptionsChangedListener);

                mTelephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_NONE);

                if (mShowLatestAreaInfo) {

                    mContext.unregisterReceiver(mAreaInfoReceiver);

                }

                mIsRegisteredListener = false;

            }

            return;

        }