From 317db73d38e3a1f64646f9503c86e761cfab55b3 Mon Sep 17 00:00:00 2001 From: Heemin Seog Date: Mon, 31 Aug 2020 14:35:53 -0700 Subject: Query for home intent as foreground user Bug: 160971249 Test: manual (log current user and resolved activity while switching users) Change-Id: Ie73617fcb56639e5acd86bd968b82ed93750e4c2 --- .../src/com/android/keyguard/KeyguardUpdateMonitor.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java index c354241da7b4..1027329b8d3c 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java @@ -2519,13 +2519,11 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 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; -- cgit v1.2.3-59-g8ed1b