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

Commit c5ad2d0f 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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie03d67d5b5db4a330a7a80c88e4d4d209b647f3e
parents f880b3a5 14cb8a52

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

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