PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Settings: Fix exception in about phone during SIM swap

Browse Source 
In about phone SIM status dialog fragment does not correctly remove the subscription change listener and broadcast receiver during SIM swap, which results in IllegalStateException force close and memroy leak.

Make sure to remove sub change listener and un-register broadcast receiver in SIM swap case.

Bug: 159410236

Change-Id: I7867852c58b2b38e0afc73422b7d616aa305199c
This commit is contained in:
hoffc
2020-06-19 15:11:36 +08:00
parent cd85c64362
commit 291fd9b816
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
View File

@@ -148,6 +148,7 @@ public class SimStatusDialogController implements LifecycleObserver, OnResume, O
private final Context mContext; private final Context mContext;
private boolean mShowLatestAreaInfo; private boolean mShowLatestAreaInfo;
private boolean mIsRegisteredListener = false;
private final BroadcastReceiver mAreaInfoReceiver = new BroadcastReceiver() { private final BroadcastReceiver mAreaInfoReceiver = new BroadcastReceiver() {
@Override @Override
@@ -277,11 +278,22 @@ public class SimStatusDialogController implements LifecycleObserver, OnResume, O
mContext.registerReceiver(mAreaInfoReceiver, mContext.registerReceiver(mAreaInfoReceiver,
new IntentFilter(CellBroadcastIntents.ACTION_AREA_INFO_UPDATED)); new IntentFilter(CellBroadcastIntents.ACTION_AREA_INFO_UPDATED));
} }
mIsRegisteredListener = true;
} }
@Override @Override
public void onPause() { public void onPause() {
if (mSubscriptionInfo == null) { if (mSubscriptionInfo == null) {
if (mIsRegisteredListener) {
mSubscriptionManager.removeOnSubscriptionsChangedListener(
mOnSubscriptionsChangedListener);
mTelephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_NONE);
if (mShowLatestAreaInfo) {
mContext.unregisterReceiver(mAreaInfoReceiver);
}
mIsRegisteredListener = false;
}
return; return;
} }