commit 317db73d38e3a1f64646f9503c86e761cfab55b3
author Heemin Seog <hseog@google.com> Mon Aug 31 14:35:53 2020 -0700
committer Heemin Seog <hseog@google.com> Mon Aug 31 14:40:45 2020 -0700
tree 91abce8fcf6209a6b7ff36112e4446bfb3a7a6c6
parent edbf3411d2c91f38a1a5d93b9e5b3380524b3ed8

Query for home intent as foreground user

Bug: 160971249
Test: manual (log current user and resolved activity while switching
users)

Change-Id: Ie73617fcb56639e5acd86bd968b82ed93750e4c2

packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java

diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
index c354241..1027329 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
@@ -2519,13 +2519,11 @@
         if (isUserUnlocked(getCurrentUser())) {
             return false;
         }
-        Intent homeIntent = new Intent(Intent.ACTION_MAIN)
-                .addCategory(Intent.CATEGORY_HOME);
-        ResolveInfo resolveInfo = mContext.getPackageManager().resolveActivity(homeIntent,
-                0 /* flags */);
+        Intent homeIntent = new Intent(Intent.ACTION_MAIN).addCategory(Intent.CATEGORY_HOME);
+        ResolveInfo resolveInfo = mContext.getPackageManager().resolveActivityAsUser(homeIntent,
+                0 /* flags */, getCurrentUser());
 
-        // TODO(b/160971249): Replace in the future by resolving activity as user.
-        if (resolveInfo == null && mIsAutomotive) {
+        if (resolveInfo == null) {
             Log.w(TAG, "resolveNeedsSlowUnlockTransition: returning false since activity "
                     + "could not be resolved.");
             return false;