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

Change-Id: I91349e1d1051aadd264d60f48d32076629ad8a88

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);