Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "When a dex file is loaded with different contexts, dexopt with "verify"." am: 222b1e4ad7 am: 64c20457e2 am: 939a1ea148

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

Change-Id: I7144b96ad4887ea46a04eedc604421688295fee8
This commit is contained in:
Treehugger Robot
2021-03-31 23:31:20 +00:00
committed by Automerger Merge Worker
parent 1b53c7b5e1 939a1ea148
commit 1937317a1d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/pm/PackageDexOptimizer.java
View File

@@ -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();
}