diff options
| author | Jonathan Scott <scottjonathan@google.com> | 2019-05-07 17:20:00 +0100 |
|---|---|---|
| committer | Nikoli Cartagena <dargeren@google.com> | 2019-06-10 14:52:43 -0700 |
| commit | 70709843712d94a514b6ca673801c1bc73e94f14 (patch) | |
| tree | 5bfe5ecdb367b8dc3d45c5477aa44fe2d5a1991c | |
| parent | e96945c10290c16505b170bf72ede8e0365609f0 (diff) | |
| download | Settings-70709843712d94a514b6ca673801c1bc73e94f14.tar.gz | |
[RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks.android-8.0.0_r42android-8.0.0_r41android-8.0.0_r40android-8.0.0_r39android-8.0.0_r38android-8.0.0_r37
Bug: 127605586
Test: Manual
Change-Id: I4186c2d57b42b6e3d27013f2c9708fca56c561fe
Merged-In: I1cdd82bea4dc9e4182694b061a7746aa83dabdfe
(cherry picked from commit b985aa2f2930e30218bdd1cf1161453b7e622418)
| -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) { |