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

am 70fc04c8: Reorganize PackageManager dump to avoid NPE

Browse Source 
* commit '70fc04c84db8f99ac2ac60fd9719b91057aacc9b':
  Reorganize PackageManager dump to avoid NPE
This commit is contained in:
Kenny Root
2010-11-05 13:58:20 -07:00
committed by Android Git Automerger
parent a27fc901d8 70fc04c84d
commit 8806fc729b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/java/com/android/server/PackageManagerService.java
View File

@@ -7166,7 +7166,9 @@ class PackageManagerService extends IPackageManager.Stub {
pw.print(" resourcePath="); pw.println(ps.resourcePathString); pw.print(" resourcePath="); pw.println(ps.resourcePathString);
pw.print(" nativeLibraryPath="); pw.println(ps.nativeLibraryPathString); pw.print(" nativeLibraryPath="); pw.println(ps.nativeLibraryPathString);
pw.print(" obbPath="); pw.println(ps.obbPathString); pw.print(" obbPath="); pw.println(ps.obbPathString);
pw.print(" versionCode="); pw.println(ps.versionCode);
if (ps.pkg != null) { if (ps.pkg != null) {
pw.print(" versionName="); pw.println(ps.pkg.mVersionName);
pw.print(" dataDir="); pw.println(ps.pkg.applicationInfo.dataDir); pw.print(" dataDir="); pw.println(ps.pkg.applicationInfo.dataDir);
pw.print(" targetSdk="); pw.println(ps.pkg.applicationInfo.targetSdkVersion); pw.print(" targetSdk="); pw.println(ps.pkg.applicationInfo.targetSdkVersion);
if (ps.pkg.mOperationPending) { 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(" pkgFlags=0x"); pw.print(Integer.toHexString(ps.pkgFlags));
pw.print(" installStatus="); pw.print(ps.installStatus); pw.print(" installStatus="); pw.print(ps.installStatus);
pw.print(" enabled="); pw.println(ps.enabled); 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) { if (ps.disabledComponents.size() > 0) {
pw.println(" disabledComponents:"); pw.println(" disabledComponents:");
for (String s : ps.disabledComponents) { for (String s : ps.disabledComponents) {