Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '9f568025129031b51d15b52259e1374459c5415a':
  Quick fix issue #17514851: dumpsys package <package-name> includes...
This commit is contained in:
Dianne Hackborn
2014-09-16 08:42:27 +00:00
committed by Android Git Automerger
parent 1360b70f40 602d17c353
commit 3f65b3c420
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -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));
}