diff options
| author | Kenny Root <kroot@google.com> | 2010-11-05 13:58:20 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-11-05 13:58:20 -0700 |
| commit | 8806fc729b96bf806806ef8d82147d59abfc1536 (patch) | |
| tree | 9d87de116485af110ecfa7cabc17fa94fa6a2c99 | |
| parent | a27fc901d8543c7734f70f0ef05977dcb94671f6 (diff) | |
| parent | 70fc04c84db8f99ac2ac60fd9719b91057aacc9b (diff) | |
| download | frameworks_base-8806fc729b96bf806806ef8d82147d59abfc1536.zip frameworks_base-8806fc729b96bf806806ef8d82147d59abfc1536.tar.gz frameworks_base-8806fc729b96bf806806ef8d82147d59abfc1536.tar.bz2 | |
am 70fc04c8: Reorganize PackageManager dump to avoid NPE
* commit '70fc04c84db8f99ac2ac60fd9719b91057aacc9b':
Reorganize PackageManager dump to avoid NPE
| -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 d324c2b..4520f18 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) { |