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

Commit 878a6ce4 authored by Martin Stjernholm's avatar Martin Stjernholm
Browse files

Change the warning for invalid ISA to notifyDexLoad to a wtf. 

This is a temporary measure to verify our assumptions about that
argument. Later we'll assume it's the caller that's wrong.

Test: Boot
Bug: 251903639
Change-Id: I7c6e9764e626fb2bc8a8ab0c65df93920785c87f
parent a2849296

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

+5 −3
Original line number Diff line number Diff line
@@ -5430,9 +5430,11 @@ public class PackageManagerService implements PackageSender, TestUtilityService 
                            String loadingPkgDexCodeIsa = InstructionSets.getDexCodeInstructionSet(

                                    VMRuntime.getInstructionSet(loadingPkgAbi));

                            if (!loaderIsa.equals(loadingPkgDexCodeIsa)) {

                                // TODO(b/251903639): Make this crash to surface this problem

                                // better.

                                Slog.w(PackageManagerService.TAG,

                                // TODO(b/251903639): We make this a wtf to surface any situations

                                // where this argument doesn't correspond to our expectations. Later

                                // it should be turned into an IllegalArgumentException, when we can

                                // assume it's the caller that's wrong rather than us.

                                Log.wtf(TAG,

                                        "Invalid loaderIsa in notifyDexLoad call from "

                                                + loadingPackageName + ", uid " + callingUid

                                                + ": expected " + loadingPkgDexCodeIsa + ", got "