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

Merge "[Settings] subscription UI should be closed when SIM is removed" am: b3efa585f2 am: 5dba10a956

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

Change-Id: I32087c8910c01323c70eb124cff1247c4d60fed5
This commit is contained in:
Bonian Chen
2020-09-11 08:04:23 +00:00
committed by Automerger Merge Worker
parent a486aae1f4 5dba10a956
commit 5975853b18
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/network/telephony/MobileNetworkActivity.java
View File

@@ -158,6 +158,11 @@ public class MobileNetworkActivity extends SettingsBaseActivity
// Remove the dialog if the subscription associated with this activity changes. // Remove the dialog if the subscription associated with this activity changes.
if (info == null) { if (info == null) {
// Close the activity when subscription removed
if ((oldSubIndex != SUB_ID_NULL)
&& (!isFinishing()) && (!isDestroyed())) {
finish();
}
return; return;
} }
int subIndex = info.getSubscriptionId(); int subIndex = info.getSubscriptionId();