From ec6943881982b9a6cca0549333f5d5cc6813654a Mon Sep 17 00:00:00 2001
From: Edgar Wang <edgarwang@google.com>
Date: Thu, 20 Jul 2023 08:57:57 +0000
Subject: [PATCH] Fix when turn off "Ask for PIN before unpinning" we don't
 check the result of ChooseLockSettings

Change-Id: I812a07b704022c5d4147c57410e8d3230fb26cdb
Fixes: 290181459
Test: manual verify
---
 src/com/android/settings/security/ScreenPinningSettings.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/security/ScreenPinningSettings.java b/src/com/android/settings/security/ScreenPinningSettings.java
index dae79e8a6cd..ea80cb0dc75 100644
--- a/src/com/android/settings/security/ScreenPinningSettings.java
+++ b/src/com/android/settings/security/ScreenPinningSettings.java
@@ -15,6 +15,8 @@
  */
 package com.android.settings.security;
 
+import static android.app.Activity.RESULT_OK;
+
 import android.app.admin.DevicePolicyManager;
 import android.app.settings.SettingsEnums;
 import android.content.Context;
@@ -167,7 +169,7 @@ public class ScreenPinningSettings extends SettingsPreferenceFragment
             setScreenLockUsed(validPassQuality);
             // Make sure the screen updates.
             mUseScreenLock.setChecked(validPassQuality);
-        } else if (requestCode == CONFIRM_REQUEST) {
+        } else if (requestCode == CONFIRM_REQUEST && resultCode == RESULT_OK) {
             setScreenLockUsedSetting(false);
         }
     }