Merge "Close and disable SIM lock dialogs when SIM removed from device." into rvc-dev am: 5c7f6d1b98 am: f29da1c2e7

Change-Id: I422bea8785a02bcb68fb2d944099711393da0180
2020-05-26 17:21:21 +00:00
parent 8b10ab93d8 f29da1c2e7
commit 3f0d810913
1 changed files with 3 additions and 0 deletions
--- a/src/com/android/settings/IccLockSettings.java
+++ b/src/com/android/settings/IccLockSettings.java
@@ -301,6 +301,9 @@ public class IccLockSettings extends SettingsPreferenceFragment

        if (mPinDialog != null) {
            mPinDialog.setEnabled(sir != null);
+            if (mSubId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
+                mPinDialog.getDialog().dismiss();
+            }
        }
        if (mPinToggle != null) {
            mPinToggle.setEnabled(sir != null);