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

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

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