Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 108c7737 authored by Andreas Gampe's avatar Andreas Gampe
Browse files

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
parent 40aa5ee5

services/core/java/com/android/server/pm/PackageManagerService.java

+2 −2
Original line number Diff line number Diff line
@@ -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,