commit 7d86790c7b5d4e9d1b8cc003bfa37727d12a87cc
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Wed May 08 20:51:40 2019 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> Wed May 08 20:51:40 2019 +0000
tree e714b867ce23e519d1357f3db49ae742aa782e01
parent 7a58589114c9bd5f05ce425cd55f366cc4eef1e7
parent 133337b4dc21c6ef5de115070d7f5d1390987b34

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

Change-Id: Ibb0d6c1d0253c78160d66e27a2847192c19d10d1

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