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

Commit 6d9ba3a7 authored by Terry Guan's avatar Terry Guan Committed by Android (Google) Code Review
Browse files

Merge "Add userId to getPackageInfo" into main

parents 111f9587 00e0d7c2

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

+5 −5
Original line number Diff line number Diff line
@@ -2872,16 +2872,16 @@ class PackageManagerShellCommand extends ShellCommand { 
                UserHandle.USER_NULL, "runGrantRevokePermission"));



        List<PackageInfo> packageInfos;

        PackageManager pm = mContext.createContextAsUser(translatedUser, 0).getPackageManager();

        if (pkg == null) {

            packageInfos = mContext.getPackageManager().getInstalledPackages(

                    PackageManager.GET_PERMISSIONS);

            packageInfos = pm.getInstalledPackages(PackageManager.GET_PERMISSIONS);

        } else {

            try {

                packageInfos = Collections.singletonList(

                        mContext.getPackageManager().getPackageInfo(pkg,

                packageInfos = Collections.singletonList(pm.getPackageInfo(pkg,

                        PackageManager.GET_PERMISSIONS));

            } catch (NameNotFoundException e) {

                getErrPrintWriter().println("Error: package not found");

                getOutPrintWriter().println("Failure [package not found]");

                return 1;

            }

        }