Commit cfef9ae1 authored by Jonathan Scott's avatar Jonathan Scott Committed by Kevin Haggerty

Make ScreenPinningSettings behaviour consistent with lock tasks.

Bug: 127605586
Test: Manual
Change-Id: I4186c2d57b42b6e3d27013f2c9708fca56c561fe
Merged-In: I1cdd82bea4dc9e4182694b061a7746aa83dabdfe
(cherry picked from commit b985aa2f)
parent 89bfa763
......@@ -112,9 +112,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) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment