Merge "Close and disable SIM lock dialogs when SIM removed from device." into rvc-dev am: 5c7f6d1b98 am: 8e8386c677 am: 224812552e am: fb719ecfc8

Change-Id: Ic613d20f1756b05765fb02983f23f8fc7a4360fd
2020-05-26 17:42:29 +00:00
parent 40ffebecd0 fb719ecfc8
commit b7d745a7a0
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);