diff options
| author | Kenny Root <kroot@google.com> | 2010-10-22 12:21:16 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-10-22 12:21:16 -0700 |
| commit | 0c4b1a82926381eff111ac921fb846a93de9d75b (patch) | |
| tree | a754626795097930d1a8ef4898914f1f7cf29315 /services/java | |
| parent | 5a1e4cf83f5be1b5d79e2643fa791aa269b6a4bc (diff) | |
| parent | 1174f71e94ec251da0f0b6220bef102f3462b300 (diff) | |
| download | frameworks_base-0c4b1a82926381eff111ac921fb846a93de9d75b.zip frameworks_base-0c4b1a82926381eff111ac921fb846a93de9d75b.tar.gz frameworks_base-0c4b1a82926381eff111ac921fb846a93de9d75b.tar.bz2 | |
Merge "Reorganize PackageManager dump to avoid NPE"
Diffstat (limited to 'services/java')
| -rw-r--r-- | services/java/com/android/server/PackageManagerService.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/java/com/android/server/PackageManagerService.java b/services/java/com/android/server/PackageManagerService.java index c50a01e..7c758a2 100644 --- a/services/java/com/android/server/PackageManagerService.java +++ b/services/java/com/android/server/PackageManagerService.java @@ -7166,7 +7166,9 @@ class PackageManagerService extends IPackageManager.Stub { pw.print(" resourcePath="); pw.println(ps.resourcePathString); pw.print(" nativeLibraryPath="); pw.println(ps.nativeLibraryPathString); pw.print(" obbPath="); pw.println(ps.obbPathString); + pw.print(" versionCode="); pw.println(ps.versionCode); if (ps.pkg != null) { + pw.print(" versionName="); pw.println(ps.pkg.mVersionName); pw.print(" dataDir="); pw.println(ps.pkg.applicationInfo.dataDir); pw.print(" targetSdk="); pw.println(ps.pkg.applicationInfo.targetSdkVersion); if (ps.pkg.mOperationPending) { @@ -7224,8 +7226,6 @@ class PackageManagerService extends IPackageManager.Stub { pw.print(" pkgFlags=0x"); pw.print(Integer.toHexString(ps.pkgFlags)); pw.print(" installStatus="); pw.print(ps.installStatus); pw.print(" enabled="); pw.println(ps.enabled); - pw.print(" versionCode="); pw.print(ps.versionCode); - pw.print(" versionName="); pw.println(ps.pkg.mVersionName); if (ps.disabledComponents.size() > 0) { pw.println(" disabledComponents:"); for (String s : ps.disabledComponents) { |