Merge "Settings: Fix exception in about phone during SIM swap" (16503cf5) · Commits · e / os / android_packages_apps_Settings

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;
		}