From 36c71e9d474459d7ade7843f63d2408189983b88 Mon Sep 17 00:00:00 2001
From: Mattias Nilsson <mattias.nilsson@sony.com>
Date: Tue, 10 May 2022 10:46:56 +0200
Subject: [PATCH] Disable "SIM card lock" when the SIM card is PUK-blocked

For an inserted PUK-blocked SIM card we should not allow
to open lock settings. Add a check for SIM_STATE_PERM_DISABLED
and disable "SIM card lock".

Test: Insert a PUK blocked card and check SIM card lock
Bug: 230370597
Change-Id: I8b468cefe95fb8bd66ab91d6c4569ddb01473fbe
---
 .../android/settings/security/SimLockPreferenceController.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/security/SimLockPreferenceController.java b/src/com/android/settings/security/SimLockPreferenceController.java
index 3b8588852e8..e570e5db386 100644
--- a/src/com/android/settings/security/SimLockPreferenceController.java
+++ b/src/com/android/settings/security/SimLockPreferenceController.java
@@ -95,7 +95,8 @@ public class SimLockPreferenceController extends BasePreferenceController {
         for (SubscriptionInfo subInfo : subInfoList) {
             final int simState = mTelephonyManager.getSimState(subInfo.getSimSlotIndex());
             if ((simState != TelephonyManager.SIM_STATE_ABSENT)
-                    && (simState != TelephonyManager.SIM_STATE_UNKNOWN)) {
+                    && (simState != TelephonyManager.SIM_STATE_UNKNOWN)
+                    && (simState != TelephonyManager.SIM_STATE_PERM_DISABLED)) {
                 return true;
             }
         }