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