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

Commit 794fdfa8 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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib59de3768ed5f4b0173f82f5a8a278f455244b19
parents f9b529ac c5ad2d0f

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