From 2eff745087f71ec9f5909bec272cda1132462609 Mon Sep 17 00:00:00 2001 From: Evan Rosky Date: Thu, 9 Jun 2016 12:32:33 -0700 Subject: [PATCH] Add option to disable lockscreen by default Bug: 27502832 Change-Id: I3e5d024c07a69f3fea1c0450040898c53b732183 --- .../com/android/internal/widget/LockPatternUtils.java | 10 ++++++++-- core/res/res/values/config.xml | 3 +++ core/res/res/values/symbols.xml | 1 + 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/core/java/com/android/internal/widget/LockPatternUtils.java b/core/java/com/android/internal/widget/LockPatternUtils.java index 2e0dfa5fa7312..b7ce7d7aa5f08 100644 --- a/core/java/com/android/internal/widget/LockPatternUtils.java +++ b/core/java/com/android/internal/widget/LockPatternUtils.java @@ -589,8 +589,14 @@ public class LockPatternUtils { * @return true if lock screen is disabled */ public boolean isLockScreenDisabled(int userId) { - return !isSecure(userId) && - getBoolean(DISABLE_LOCKSCREEN_KEY, false, userId); + if (isSecure(userId)) { + return false; + } + boolean disabledByDefault = mContext.getResources().getBoolean( + com.android.internal.R.bool.config_disableLockscreenByDefault); + boolean isSystemUser = UserManager.isSplitSystemUser() && userId == UserHandle.USER_SYSTEM; + return getBoolean(DISABLE_LOCKSCREEN_KEY, false, userId) + || (disabledByDefault && !isSystemUser); } /** diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index ca079c434446e..6e4dfc7992eb3 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -967,6 +967,9 @@ If so, this should be set to 'false' in an overlay. --> true + + false +