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

Commit 572c67bf authored by Hai Zhang's avatar Hai Zhang
Browse files

Add a command to print the shared UID allowlist 

This command can be used to report configuration and help debug any
issues.

Bug: 336568924
Test: adb shell pm get-shared-uid-allowlist
Change-Id: I1b61e381929be291099e892b3fa69cfa25b8ca67
parent f1abed23

services/core/java/com/android/server/SystemConfig.java

+2 −2
Original line number Diff line number Diff line
@@ -352,7 +352,7 @@ public class SystemConfig { 
    @NonNull private final Set<String> mInitialNonStoppedSystemPackages = new ArraySet<>();



    // Which packages (key) are allowed to join particular SharedUid (value).

    @NonNull private final Map<String, String> mPackageToSharedUidAllowList = new ArrayMap<>();

    @NonNull private final ArrayMap<String, String> mPackageToSharedUidAllowList = new ArrayMap<>();



    // A map of preloaded package names and the path to its app metadata file path.

    private final ArrayMap<String, String> mAppMetadataFilePaths = new ArrayMap<>();
@@ -574,7 +574,7 @@ public class SystemConfig { 
    }



    @NonNull

    public Map<String, String> getPackageToSharedUidAllowList() {

    public ArrayMap<String, String> getPackageToSharedUidAllowList() {

        return mPackageToSharedUidAllowList;

    }

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

+19 −0
Original line number Diff line number Diff line
@@ -330,6 +330,8 @@ class PackageManagerShellCommand extends ShellCommand { 
                    return runGetOemPermissions();

                case "get-signature-permission-allowlist":

                    return runGetSignaturePermissionAllowlist();

                case "get-shared-uid-allowlist":

                    return runGetSharedUidAllowlist();

                case "trim-caches":

                    return runTrimCaches();

                case "create-user":
@@ -2970,6 +2972,20 @@ class PackageManagerShellCommand extends ShellCommand { 
        return 0;

    }



    private int runGetSharedUidAllowlist() {

        final var allowlist = SystemConfig.getInstance().getPackageToSharedUidAllowList();

        final var pw = getOutPrintWriter();

        final var allowlistSize = allowlist.size();

        for (var allowlistIndex = 0; allowlistIndex < allowlistSize; allowlistIndex++) {

            final var packageName = allowlist.keyAt(allowlistIndex);

            final var sharedUserName = allowlist.valueAt(allowlistIndex);

            pw.print(packageName);

            pw.print(" ");

            pw.println(sharedUserName);

        }

        return 0;

    }



    private int runTrimCaches() throws RemoteException {

        String size = getNextArg();

        if (size == null) {
@@ -4906,6 +4922,9 @@ class PackageManagerShellCommand extends ShellCommand { 
        pw.println("    Prints the signature permission allowlist for a partition.");

        pw.println("    PARTITION is one of system, vendor, product and system-ext");

        pw.println("");

        pw.println("  get-shared-uid-allowlist");

        pw.println("    Prints the shared UID allowlist.");

        pw.println("");

        pw.println("  trim-caches DESIRED_FREE_SPACE [internal|UUID]");

        pw.println("    Trim cache files to reach the given free space.");

        pw.println("");