diff options
| -rw-r--r-- | src/com/android/settings/ScreenPinningSettings.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/settings/ScreenPinningSettings.java b/src/com/android/settings/ScreenPinningSettings.java index d74a07fa154..8020a8ce3de 100644 --- a/src/com/android/settings/ScreenPinningSettings.java +++ b/src/com/android/settings/ScreenPinningSettings.java @@ -106,9 +106,11 @@ public class ScreenPinningSettings extends SettingsPreferenceFragment } private boolean isScreenLockUsed() { - int def = getCurrentSecurityTitle() != R.string.screen_pinning_unlock_none ? 1 : 0; + // This functionality should be kept consistent with + // com.android.server.am.ActivityStackSupervisor (see b/127605586) + int defaultValueIfSettingNull = mLockPatternUtils.isSecure(UserHandle.myUserId()) ? 1 : 0; return Settings.Secure.getInt(getContentResolver(), - Settings.Secure.LOCK_TO_APP_EXIT_LOCKED, def) != 0; + Settings.Secure.LOCK_TO_APP_EXIT_LOCKED, defaultValueIfSettingNull) != 0; } private boolean setScreenLockUsed(boolean isEnabled) { |