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

Commit 1ba740fd authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 372e3240: am 02c038e0: am 9f568025: Merge "Quick fix issue #17514851:... 

am 372e3240: am 02c038e0: am 9f568025: Merge "Quick fix issue #17514851: dumpsys package <package-name> includes..." into lmp-dev

* commit '372e3240bc406fcfe938e597a3d60264ed304e65':
  Quick fix issue #17514851: dumpsys package <package-name> includes...
parents f067f8fb 7ac65e04

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

+5 −3
Original line number Diff line number Diff line
@@ -12118,14 +12118,14 @@ public class PackageManagerService extends IPackageManager.Stub { 
                dumpState.setDump(DumpState.DUMP_VERSION);

            } else if ("k".equals(cmd) || "keysets".equals(cmd)) {

                dumpState.setDump(DumpState.DUMP_KEYSETS);

            } else if ("installs".equals(cmd)) {

                dumpState.setDump(DumpState.DUMP_INSTALLS);

            } else if ("write".equals(cmd)) {

                synchronized (mPackages) {

                    mSettings.writeLPr();

                    pw.println("Settings written.");

                    return;

                }

            } else if ("installs".equals(cmd)) {

                dumpState.setDump(DumpState.DUMP_INSTALLS);

            }

        }










@@ -12357,7 +12357,9 @@ public class PackageManagerService extends IPackageManager.Stub {













                mSettings.dumpSharedUsersLPr(pw, packageName, dumpState);















            }



























            if (!checkin && dumpState.isDumping(DumpState.DUMP_INSTALLS)) {













            if (!checkin && dumpState.isDumping(DumpState.DUMP_INSTALLS) && packageName == null) {













                // XXX should handle packageName != null by dumping only install data that













                // the given package is involved with.















                if (dumpState.onTitlePrinted()) pw.println();















                mInstallerService.dump(new IndentingPrintWriter(pw, "  ", 120));















            }