summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Andreas Gampe <agampe@google.com> 2017-03-15 20:25:02 +0000
committer android-build-merger <android-build-merger@google.com> 2017-03-15 20:25:02 +0000
commitade616eb7f9083e51388edab31e9eb8bfdb5dae7 (patch)
tree94c967b30803f24f4854018096988147d9f22369
parent2bd530e1562bcbf99b6d1b2f447b4b835d3bc43e (diff)
parent77ede7ab806cb76caeefb62598a8ae11896f3c56 (diff)
Merge "PackageManagerService: Fix ABI adjustment logging" am: 844be62eef am: 0c662c0ac0
am: 77ede7ab80 Change-Id: Ie2133c4e8e5abfd6979ba5c03c8d347985a5dcb4
-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 12890190aefc..4ac1cce91402 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -10565,9 +10565,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,