Updates isKeyguardSecure to take in a user id.
Updates all the callers to pass in a user id.
Implementation was broken when called by a singleton component
(singleUser=true) with a foreground secondary user. It would return
the keyguard state of user 0, rather than the foreground user.
Fixes: 123375796
Test: atest CtsActivityManagerDeviceTestCases:KeyguardLockedTests with secondary user in the foreground
Change-Id: Ieb7217f5e1dddb65f8987242e675c3dff0a80aab
diff --git a/services/core/java/com/android/server/wm/KeyguardController.java b/services/core/java/com/android/server/wm/KeyguardController.java
index 8c8b05f..72a1a2f 100644
--- a/services/core/java/com/android/server/wm/KeyguardController.java
+++ b/services/core/java/com/android/server/wm/KeyguardController.java
@@ -269,7 +269,8 @@
* @return True if we may show an activity while Keyguard is occluded, false otherwise.
*/
boolean canShowWhileOccluded(boolean dismissKeyguard, boolean showWhenLocked) {
- return showWhenLocked || dismissKeyguard && !mWindowManager.isKeyguardSecure();
+ return showWhenLocked || dismissKeyguard
+ && !mWindowManager.isKeyguardSecure(mService.getCurrentUserId());
}
private void visibilitiesUpdated() {
@@ -317,7 +318,7 @@
// We only allow dismissing Keyguard via the flag when Keyguard is secure for legacy
// reasons, because that's how apps used to dismiss Keyguard in the secure case. In the
// insecure case, we actually show it on top of the lockscreen. See #canShowWhileOccluded.
- if (!mWindowManager.isKeyguardSecure()) {
+ if (!mWindowManager.isKeyguardSecure(mService.getCurrentUserId())) {
return;
}
@@ -345,7 +346,8 @@
* @return true if Keyguard can be currently dismissed without entering credentials.
*/
boolean canDismissKeyguard() {
- return mWindowManager.isKeyguardTrusted() || !mWindowManager.isKeyguardSecure();
+ return mWindowManager.isKeyguardTrusted()
+ || !mWindowManager.isKeyguardSecure(mService.getCurrentUserId());
}
private int resolveOccludeTransit() {
@@ -487,7 +489,8 @@
}
if (lastDismissActivity != mDismissingKeyguardActivity && !mOccluded
&& mDismissingKeyguardActivity != null
- && controller.mWindowManager.isKeyguardSecure()) {
+ && controller.mWindowManager.isKeyguardSecure(
+ controller.mService.getCurrentUserId())) {
mRequestDismissKeyguard = true;
}
}