From 108c7737dae7c9137a0966004285c99bb24e7f9b Mon Sep 17 00:00:00 2001 From: Andreas Gampe Date: Wed, 15 Mar 2017 10:09:57 -0700 Subject: [PATCH] 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 --- .../java/com/android/server/pm/PackageManagerService.java | 4 ++-- 1 file 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 94522198c3dfc..42f650247c209 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,