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

Commit a0dc6829 authored by Omar Eissa's avatar Omar Eissa Committed by Automerger Merge Worker
Browse files

Merge "Support showing initial non stopped system packages" into udc-dev am:...

Merge "Support showing initial non stopped system packages" into udc-dev am: 9a5003db am: 8f0eb42e

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



Change-Id: I086cc619d521fdfe31560b0d3db1321388cfaaa2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 372ed2a8 8f0eb42e
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -508,6 +508,8 @@ interface IPackageManager {

    boolean hasSystemFeature(String name, int version);

    List<String> getInitialNonStoppedSystemPackages();

    void enterSafeMode();
    @UnsupportedAppUsage
    boolean isSafeMode();
+6 −0
Original line number Diff line number Diff line
@@ -5280,6 +5280,12 @@ public class PackageManagerService implements PackageSender, TestUtilityService
            return new ParceledListSlice<>(res);
        }

        @Override
        public @NonNull List<String> getInitialNonStoppedSystemPackages() {
            return mInitialNonStoppedSystemPackages != null
                    ? new ArrayList<>(mInitialNonStoppedSystemPackages) : new ArrayList<>();
        }

        @Override
        public String[] getUnsuspendablePackagesForUser(String[] packageNames, int userId) {
            Objects.requireNonNull(packageNames, "packageNames cannot be null");
+17 −0
Original line number Diff line number Diff line
@@ -782,6 +782,8 @@ class PackageManagerShellCommand extends ShellCommand {
                        getInFileDescriptor(), getOutFileDescriptor(), getErrFileDescriptor(),
                        new String[] { "list" }, getShellCallback(), adoptResultReceiver());
                return 0;
            case "initial-non-stopped-system-packages":
                return runListInitialNonStoppedSystemPackages();
        }
        pw.println("Error: unknown list type '" + type + "'");
        return -1;
@@ -794,6 +796,21 @@ class PackageManagerShellCommand extends ShellCommand {
        return 0;
    }

    private int runListInitialNonStoppedSystemPackages() throws RemoteException {
        final PrintWriter pw = getOutPrintWriter();
        final List<String> list = mInterface.getInitialNonStoppedSystemPackages();

        Collections.sort(list);

        for (String pkgName : list) {
            pw.print("package:");
            pw.print(pkgName);
            pw.println();
        }

        return 0;
    }

    private int runListFeatures() throws RemoteException {
        final PrintWriter pw = getOutPrintWriter();
        final List<FeatureInfo> list = mInterface.getSystemAvailableFeatures().getList();