Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8806fc72 authored by Kenny Root's avatar Kenny Root Committed by Android Git Automerger
Browse files

am 70fc04c8: Reorganize PackageManager dump to avoid NPE 

* commit '70fc04c8':
  Reorganize PackageManager dump to avoid NPE
parents a27fc901 70fc04c8

services/java/com/android/server/PackageManagerService.java

+2 −2
Original line number Diff line number Diff line
@@ -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) {