summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Hidehiko Tsuchiya <hidehiko.xa.tsuchiya@sonymobile.com> 2019-08-22 16:22:24 +0900
committer Todd Kennedy <toddke@google.com> 2019-09-03 02:28:04 -0700
commita0f42bea105d06e06f660d23953bbb909b76c82c (patch)
treeb20cb32b44f74cfcde066e59c1e918fdd0551c71
parent0ec249bd62dcfa104a718dbebd878fe387097201 (diff)
Fix PackageManagerService crashed due to NPE during debugging installing
Symptom: PackageManagerService crashed due to NPE during debugging installing an invalid package. The crash can be observed only when DEBUG_INSTALL flag is true. Root cause: In this case, the null object access occurs during debug output. Solution: Avoid directly accessing packageName. Show the package name via toString() of Package object. Bug: 140057579 Change-Id: I302903a2a6b29454dbf718a07c82f5583f93097c
-rw-r--r--services/core/java/com/android/server/pm/PackageManagerService.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 41403fdeeeef..6fbfed859551 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -13788,8 +13788,7 @@ public class PackageManagerService extends IPackageManager.Stub
private void restoreAndPostInstall(
int userId, PackageInstalledInfo res, @Nullable PostInstallData data) {
if (DEBUG_INSTALL) {
- Log.v(TAG, "restoreAndPostInstall userId=" + userId + " package="
- + res.pkg.packageName);
+ Log.v(TAG, "restoreAndPostInstall userId=" + userId + " package=" + res.pkg);
}
// A restore should be performed at this point if (a) the install