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

Commit e11eb10e authored by Russell Brenner's avatar Russell Brenner Committed by Android (Google) Code Review
Browse files

Merge "Match SUW package after FBE reboot" into nyc-dev

parents 4bb80305 d69c9e7e

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

+3 −1
Original line number Diff line number Diff line
@@ -17003,7 +17003,9 @@ Slog.v(TAG, ":: stepped forward, applying functor at tag " + parser.getName()); 
        intent.addCategory(Intent.CATEGORY_SETUP_WIZARD);















        final List<ResolveInfo> matches = queryIntentActivitiesInternal(intent, null,













                MATCH_SYSTEM_ONLY | MATCH_DISABLED_COMPONENTS, UserHandle.myUserId());













                MATCH_SYSTEM_ONLY | MATCH_DIRECT_BOOT_AWARE | MATCH_DIRECT_BOOT_UNAWARE













                        | MATCH_DISABLED_COMPONENTS,













                UserHandle.myUserId());















        if (matches.size() == 1) {















            return matches.get(0).getComponentInfo().packageName;















        } else {