commit 5dba10a9568548f818d8201f7772ea871141db6c
author Bonian Chen <bonianchen@google.com> Fri Sep 11 07:17:53 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Sep 11 07:17:53 2020 +0000
tree fbdb8edc691392a001c041c5db18e2f02462ac1b
parent 3fd1488575470e77fc9fff3ef1e1dadb75b67ca8
parent b3efa585f2aa062a73388060ed3268a598e2463f

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

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

Change-Id: I3ced24e5b1d9f382e6041c38414d8247c2e2abe4

src/com/android/settings/network/telephony/MobileNetworkActivity.java

diff --git a/src/com/android/settings/network/telephony/MobileNetworkActivity.java b/src/com/android/settings/network/telephony/MobileNetworkActivity.java
index 7f7dc3a..a792824 100644
--- a/src/com/android/settings/network/telephony/MobileNetworkActivity.java
+++ b/src/com/android/settings/network/telephony/MobileNetworkActivity.java
@@ -158,6 +158,11 @@
 
         // Remove the dialog if the subscription associated with this activity changes.
         if (info == null) {
+            // Close the activity when subscription removed
+            if ((oldSubIndex != SUB_ID_NULL)
+                    && (!isFinishing()) && (!isDestroyed())) {
+                finish();
+            }
             return;
         }
         int subIndex = info.getSubscriptionId();