summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Hai Zhang <zhanghai@google.com> 2021-02-25 02:54:27 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2021-02-25 02:54:27 +0000
commita10e9ca595fb6bc929eef964c475db9d44b59949 (patch)
treed50cb101372c1af786bfc72ab048a6d924adf575
parent7a0ceca5e4d71ab01e12c62a6801e8f4f3b7ec2a (diff)
parent2dc54247dd33670c80ff601891dc12a7f557736f (diff)
Merge "Match both direct boot aware and unaware when updating default home."
-rw-r--r--services/core/java/com/android/server/pm/PackageManagerService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index e0ec6bfb7a70..bec17e0daca7 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -20598,7 +20598,7 @@ public class PackageManagerService extends IPackageManager.Stub
}
final Intent intent = getHomeIntent();
final List<ResolveInfo> resolveInfos = queryIntentActivitiesInternal(intent, null,
- PackageManager.GET_META_DATA, userId);
+ MATCH_DIRECT_BOOT_AWARE | MATCH_DIRECT_BOOT_UNAWARE, userId);
final ResolveInfo preferredResolveInfo = findPreferredActivityNotLocked(
intent, null, 0, resolveInfos, 0, true, false, false, userId);
final String packageName = preferredResolveInfo != null