summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--services/core/java/com/android/server/am/ActivityStackSupervisor.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
index 54bb526b745b..f6b1e4cec117 100644
--- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java
+++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
@@ -4596,9 +4596,10 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D
}
mLockTaskNotify.show(false);
try {
- boolean shouldLockKeyguard = Settings.Secure.getInt(
+ boolean shouldLockKeyguard = Settings.Secure.getIntForUser(
mService.mContext.getContentResolver(),
- Settings.Secure.LOCK_TO_APP_EXIT_LOCKED) != 0;
+ Settings.Secure.LOCK_TO_APP_EXIT_LOCKED,
+ UserHandle.USER_CURRENT) != 0;
if (mLockTaskModeState == LOCK_TASK_MODE_PINNED && shouldLockKeyguard) {
mWindowManager.lockNow(null);
mWindowManager.dismissKeyguard(null /* callback */);