Merge "Close and disable SIM lock dialogs when SIM removed from device." into rvc-dev

2020-05-26 16:52:42 +00:00
parent f3ad1ec7b7 f203a66a74
commit 5c7f6d1b98
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);