PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix when turn off "Ask for PIN before unpinning" we don't check the result of ChooseLockSettings" into main

Browse Source
This commit is contained in:
Edgar Wang
2023-08-02 09:15:56 +00:00
committed by Android (Google) Code Review
parent 2b2dfebaff ec69438819
commit a789e9214e
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/security/ScreenPinningSettings.java
View File

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