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

[automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am: b985aa2f29

Browse Source 
Change-Id: Iee20bc7fe4fe756b87c9231689792ab50f8a76bc
This commit is contained in:
Android Build Merger (Role)
2019-05-08 20:51:37 +00:00
parent b810aee20f b985aa2f29
commit 133337b4dc
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/ScreenPinningSettings.java
View File

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