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

am 2705387d: Merge "Include splits in dumpsys package output." into lmp-mr1-dev

Browse Source 
* commit '2705387df6f3ffe87b2a3a71a48eea7e2be44fb1':
  Include splits in dumpsys package output.
This commit is contained in:
Jeff Sharkey
2014-12-02 00:45:44 +00:00
committed by Android Git Automerger
parent 4bdf266c03 2705387df6
commit a8d0a3ae60
1 changed files with 36 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
services/core/java/com/android/server/pm/Settings.java
View File

@@ -3324,6 +3324,18 @@ final class Settings {
pw.print(","); pw.print(",");
pw.print(ps.installerPackageName != null ? ps.installerPackageName : "?"); pw.print(ps.installerPackageName != null ? ps.installerPackageName : "?");
pw.println(); pw.println();
if (ps.pkg != null) {
pw.print(checkinTag); pw.print("-"); pw.print("splt,");
pw.print("base,");
pw.println(ps.pkg.baseRevisionCode);
if (ps.pkg.splitNames != null) {
for (int i = 0; i < ps.pkg.splitNames.length; i++) {
pw.print(checkinTag); pw.print("-"); pw.print("splt,");
pw.print(ps.pkg.splitNames[i]); pw.print(",");
pw.println(ps.pkg.splitRevisionCodes[i]);
}
}
}
for (UserInfo user : users) { for (UserInfo user : users) {
pw.print(checkinTag); pw.print(checkinTag);
pw.print("-"); pw.print("-");
@@ -3374,6 +3386,7 @@ final class Settings {
pw.println(); pw.println();
if (ps.pkg != null) { if (ps.pkg != null) {
pw.print(prefix); pw.print(" versionName="); pw.println(ps.pkg.mVersionName); pw.print(prefix); pw.print(" versionName="); pw.println(ps.pkg.mVersionName);
pw.print(prefix); pw.print(" splits="); dumpSplitNames(pw, ps.pkg); pw.println();
pw.print(prefix); pw.print(" applicationInfo="); pw.print(prefix); pw.print(" applicationInfo=");
pw.println(ps.pkg.applicationInfo.toString()); pw.println(ps.pkg.applicationInfo.toString());
pw.print(prefix); pw.print(" flags="); printFlags(pw, ps.pkg.applicationInfo.flags, pw.print(prefix); pw.print(" flags="); printFlags(pw, ps.pkg.applicationInfo.flags,
@@ -3646,4 +3659,27 @@ final class Settings {
pw.println("Settings parse messages:"); pw.println("Settings parse messages:");
pw.print(mReadMessages.toString()); pw.print(mReadMessages.toString());
} }
private static void dumpSplitNames(PrintWriter pw, PackageParser.Package pkg) {
if (pkg == null) {
pw.print("unknown");
} else {
// [base:10, config.mdpi, config.xhdpi:12]
pw.print("[");
pw.print("base");
if (pkg.baseRevisionCode != 0) {
pw.print(":"); pw.print(pkg.baseRevisionCode);
}
if (pkg.splitNames != null) {
for (int i = 0; i < pkg.splitNames.length; i++) {
pw.print(", ");
pw.print(pkg.splitNames[i]);
if (pkg.splitRevisionCodes[i] != 0) {
pw.print(":"); pw.print(pkg.splitRevisionCodes[i]);
}
}
}
pw.print("]");
}
}
} }