From f203a66a74698873cec61b6c9c8c573ab253b10b Mon Sep 17 00:00:00 2001
From: Grace Jia <xiaotonj@google.com>
Date: Wed, 20 May 2020 14:32:04 -0700
Subject: [PATCH] Close and disable SIM lock dialogs when SIM removed from
 device.

Bug: 157102550
Test: Manually open the PIN toggle dialog and PIN edit dialog, then
remove SIM from DUT

Change-Id: Ied875909e9cbcb1cad1ae045578747a0a5810491
---
 src/com/android/settings/IccLockSettings.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/com/android/settings/IccLockSettings.java b/src/com/android/settings/IccLockSettings.java
index 10b911b7ebe..4d12043f1b2 100644
--- 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);