summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Andreas Gampe <agampe@google.com> 2017-03-15 10:09:57 -0700
committer Andreas Gampe <agampe@google.com> 2017-03-15 10:38:54 -0700
commit108c7737dae7c9137a0966004285c99bb24e7f9b (patch)
treee9b8d8e9c4213fa25d7561d3d09f8bf6fbcd3bd3
parent40aa5ee583c3948e1ac67b0afff71f899d131414 (diff)
PackageManagerService: Fix ABI adjustment logging
Fix logging of "Adjusting ABI" to be tolerant to null packages. Bug: 36172429 Test: m Test: manual Change-Id: Ic6b9a8e09e58dce6be97e464fe3986c709f820de
-rw-r--r--services/core/java/com/android/server/pm/PackageManagerService.java4
1 files changed, 2 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 94522198c3df..42f650247c20 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -9234,9 +9234,9 @@ public class PackageManagerService extends IPackageManager.Stub {
ps.pkg.applicationInfo.primaryCpuAbi = adjustedAbi;
Slog.i(TAG, "Adjusting ABI for " + ps.name + " to " + adjustedAbi
+ " (requirer="
- + (requirer == null ? "null" : requirer.pkg.packageName)
+ + (requirer != null ? requirer.pkg : "null")
+ ", scannedPackage="
- + (scannedPackage != null ? scannedPackage.packageName : "null")
+ + (scannedPackage != null ? scannedPackage : "null")
+ ")");
try {
mInstaller.rmdex(ps.codePathString,