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

Commit 9c353cfe authored by Russell Brenner's avatar Russell Brenner Committed by android-build-merger
Browse files

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

am: e11eb10e

* commit 'e11eb10e':
  Match SUW package after FBE reboot

Change-Id: I8132e7e2f7342da087e1398a2ee337a4a403abef
parents 87a30bae e11eb10e

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

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