commit ec6943881982b9a6cca0549333f5d5cc6813654a
author Edgar Wang <edgarwang@google.com> Thu Jul 20 08:57:57 2023 +0000
committer Edgar Wang <edgarwang@google.com> Thu Jul 20 08:58:02 2023 +0000
tree 681a950e8dc051f64c4b7af4829a2b9f66b579f6
parent ab75ea8099dabda3df6f62104f60f84937174b91

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

diff --git a/src/com/android/settings/security/ScreenPinningSettings.java b/src/com/android/settings/security/ScreenPinningSettings.java
index dae79e8..ea80cb0 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 @@
             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);
         }
     }