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
This commit is contained in:
Andreas Gampe
2017-03-15 10:09:57 -07:00
parent 40aa5ee583
commit 108c7737da

View File

@@ -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,