commit 333afb4357577ae0899312ea7e32a55994b85aa6
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Wed May 08 20:51:45 2019 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> Wed May 08 20:51:45 2019 +0000
tree 78811882bf100f1542b1b441c6457924b2e19a68
parent d6bde3f5b8f2074990a5df3637dace2b8d5043c3
parent 003ce809c6986398c4d1456f78e2eb5c31651099

[automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am: b985aa2f29 am: 133337b4dc am: 7d86790c7b am: 003ce809c6

Change-Id: Ief43c33183fa5f24cf3bd9f26c9d7362d235492e

src/com/android/settings/ScreenPinningSettings.java

diff --git a/src/com/android/settings/ScreenPinningSettings.java b/src/com/android/settings/ScreenPinningSettings.java
index fb28dfb..9ff4893 100644
--- a/src/com/android/settings/ScreenPinningSettings.java
+++ b/src/com/android/settings/ScreenPinningSettings.java
@@ -106,9 +106,11 @@
     }
 
     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) {