PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make ScreenPinningSettings behaviour consistent with LockTaskController." into qt-dev

Browse Source 
am: c6ebdfe982

Change-Id: I32964e483961eaf3139a864e525e45eb495bc5d7
This commit is contained in:
Jonathan Scott
2019-05-10 00:08:38 -07:00
committed by android-build-merger
parent c9b2389025 c6ebdfe982
commit 21bb8ebde2
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/security/ScreenPinningSettings.java
View File

@@ -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) {