diff options
| author | Jonathan Scott <scottjonathan@google.com> | 2019-04-30 15:52:52 +0100 |
|---|---|---|
| committer | Jonathan Scott <scottjonathan@google.com> | 2019-05-01 11:00:25 +0100 |
| commit | cccc56b0cf426e043132d1625f76986afb0fe253 (patch) | |
| tree | 4c357a3c51b54e248c5c33a29616f4c7277db68b /src/com/android/settings/security | |
| parent | c962ea0978cb98ede72a4f74827fd645469f772f (diff) | |
| download | packages_apps_Settings-cccc56b0cf426e043132d1625f76986afb0fe253.tar.gz packages_apps_Settings-cccc56b0cf426e043132d1625f76986afb0fe253.tar.bz2 packages_apps_Settings-cccc56b0cf426e043132d1625f76986afb0fe253.zip | |
Make ScreenPinningSettings behaviour consistent with LockTaskController.
Bug: 127605586
Test: Manual
Change-Id: I1d79fb529cfaf921657ef9eaca01b8a6a4e2dfef
Diffstat (limited to 'src/com/android/settings/security')
| -rw-r--r-- | src/com/android/settings/security/ScreenPinningSettings.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/com/android/settings/security/ScreenPinningSettings.java b/src/com/android/settings/security/ScreenPinningSettings.java index 22223fdce5..c60fd472a9 100644 --- a/src/com/android/settings/security/ScreenPinningSettings.java +++ b/src/com/android/settings/security/ScreenPinningSettings.java @@ -117,9 +117,13 @@ public class ScreenPinningSettings extends SettingsPreferenceFragment } private boolean isScreenLockUsed() { - int def = getCurrentSecurityTitle() != R.string.screen_pinning_unlock_none ? 1 : 0; - return Settings.Secure.getInt(getContentResolver(), - Settings.Secure.LOCK_TO_APP_EXIT_LOCKED, def) != 0; + // This functionality should be kept consistent with + // com.android.server.wm.LockTaskController (see b/127605586) + int defaultValueIfSettingNull = mLockPatternUtils.isSecure(UserHandle.myUserId()) ? 1 : 0; + return Settings.Secure.getInt( + getContentResolver(), + Settings.Secure.LOCK_TO_APP_EXIT_LOCKED, + defaultValueIfSettingNull) != 0; } private boolean setScreenLockUsed(boolean isEnabled) { |