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

Commit ade616eb authored by Andreas Gampe's avatar Andreas Gampe Committed by android-build-merger
Browse files

Merge "PackageManagerService: Fix ABI adjustment logging" am: 844be62e am: 0c662c0a 

am: 77ede7ab

Change-Id: Ie2133c4e8e5abfd6979ba5c03c8d347985a5dcb4
parents 2bd530e1 77ede7ab

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -10565,9 +10565,9 @@ public class PackageManagerService extends IPackageManager.Stub { 
                        ps.pkg.applicationInfo.primaryCpuAbi = adjustedAbi;

                        ps.pkg.applicationInfo.primaryCpuAbi = adjustedAbi;

                        Slog.i(TAG, "Adjusting ABI for " + ps.name + " to " + adjustedAbi

                        Slog.i(TAG, "Adjusting ABI for " + ps.name + " to " + adjustedAbi

                                + " (requirer="

                                + " (requirer="

                                + (requirer == null ? "null" : requirer.pkg.packageName)

                                + (requirer != null ? requirer.pkg : "null")

                                + ", scannedPackage="

                                + ", scannedPackage="

                                + (scannedPackage != null ? scannedPackage.packageName : "null")

                                + (scannedPackage != null ? scannedPackage : "null")

                                + ")");

                                + ")");

                        try {

                        try {

                            mInstaller.rmdex(ps.codePathString,

                            mInstaller.rmdex(ps.codePathString,