commit 73067cf10ac93d1cbbb1e4d7932b97b07e8184d0
author Jonathan Scott <scottjonathan@google.com> Tue May 07 17:20:00 2019 +0100
committer Nikoli Cartagena <dargeren@google.com> Mon Jun 10 11:35:30 2019 -0700
tree 0a60da7e6adc0b66e79497b270c4baaad2b6431d
parent 96e9f3005ffb9696ff80943b884a2758b51d11db

[RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks.

Bug: 127605586
Test: Manual
Change-Id: I4186c2d57b42b6e3d27013f2c9708fca56c561fe
Merged-In: I1cdd82bea4dc9e4182694b061a7746aa83dabdfe
(cherry picked from commit b985aa2f2930e30218bdd1cf1161453b7e622418)

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