Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f6f12e6d authored by Hai Zhang's avatar Hai Zhang Committed by Automerger Merge Worker
Browse files

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

Merge "Match both direct boot aware and unaware when updating default home." am: a10e9ca5 am: 14cb8a52 am: c5ad2d0f am: 794fdfa8

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554659

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I046f5114aecb1c26b768f6d1b0aadc6044224bed
parents 374aba3d 794fdfa8

services/core/java/com/android/server/pm/PackageManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -22673,7 +22673,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