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

Commit 1937317a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

Merge "When a dex file is loaded with different contexts, dexopt with "verify"." am: 222b1e4a am: 64c20457 am: 939a1ea1

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1660361

Change-Id: I7144b96ad4887ea46a04eedc604421688295fee8
parents 1b53c7b5 939a1ea1

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

+2 −2
Original line number Diff line number Diff line
@@ -489,9 +489,9 @@ public class PackageDexOptimizer { 
        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();

        }