commit c6ebdfe98227093423abbcb6be054b2acf72456b
author TreeHugger Robot <treehugger-gerrit@google.com> Thu May 09 23:46:22 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 09 23:46:22 2019 +0000
tree ef5d5e5c90efafbfd47929e9c6d455b9d28759de
parent 43c09673ab6b11337fd2cd482e2100c0b15fb410
parent cccc56b0cf426e043132d1625f76986afb0fe253

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

src/com/android/settings/security/ScreenPinningSettings.java

diff --git a/src/com/android/settings/security/ScreenPinningSettings.java b/src/com/android/settings/security/ScreenPinningSettings.java
index 22223fd..c60fd47 100644
--- a/src/com/android/settings/security/ScreenPinningSettings.java
+++ b/src/com/android/settings/security/ScreenPinningSettings.java
@@ -117,9 +117,13 @@
     }
 
     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) {