commit 222b1e4ad71608afdea98234f101fdff58dcc35e
author Treehugger Robot <treehugger-gerrit@google.com> Wed Mar 31 22:44:25 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 31 22:44:25 2021 +0000
tree 72a275cf98586a7dc8f1f773bf6011dbb9a40ff0
parent 2e0c2171fdad40e004a2e6969e68d5c30a269fd1
parent d51fd91fbcf20d7d48f6afcee382f9be553560c3

Merge "When a dex file is loaded with different contexts, dexopt with "verify"."

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

diff --git a/services/core/java/com/android/server/pm/PackageDexOptimizer.java b/services/core/java/com/android/server/pm/PackageDexOptimizer.java
index 69c8314..0e4a2ee 100644
--- a/services/core/java/com/android/server/pm/PackageDexOptimizer.java
+++ b/services/core/java/com/android/server/pm/PackageDexOptimizer.java
@@ -489,9 +489,9 @@
         String classLoaderContext = null;
         if (dexUseInfo.isUnsupportedClassLoaderContext()
                 || dexUseInfo.isVariableClassLoaderContext()) {
-            // If we have an unknown (not yet set), or a variable class loader chain. Just extract
+            // If we have an unknown (not yet set), or a variable class loader chain. Just verify
             // the dex file.
-            compilerFilter = "extract";
+            compilerFilter = "verify";
         } else {
             classLoaderContext = dexUseInfo.getClassLoaderContext();
         }