Merge "Match both direct boot aware and unaware when updating default home."

This commit is contained in:
Hai Zhang
2021-02-25 02:54:27 +00:00
committed by Gerrit Code Review

View File

@@ -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