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

Merge "Don't upgrade "extract" or "assume-verified" filters to "verify" when embedded dex files should be used."

Browse Source
This commit is contained in:
Martin Stjernholm
2022-11-23 20:11:38 +00:00
committed by Android (Google) Code Review
parent 723a3aedc1 9d5a475d34
commit 0d49581d48
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -785,7 +785,9 @@ public class PackageDexOptimizer {
private String getRealCompilerFilter(ApplicationInfo info, String targetCompilerFilter,
boolean isUsedByOtherApps) {
if (info.isEmbeddedDexUsed()) {
return "verify";
// Downgrade optimizing filters to "verify", but don't upgrade lower filters.
return DexFile.isOptimizedCompilerFilter(targetCompilerFilter) ? "verify"
: targetCompilerFilter;
}
// We force vmSafeMode on debuggable apps as well:
@@ -822,7 +824,9 @@ public class PackageDexOptimizer {
*/
private String getRealCompilerFilter(AndroidPackage pkg, String targetCompilerFilter) {
if (pkg.isUseEmbeddedDex()) {
return "verify";
// Downgrade optimizing filters to "verify", but don't upgrade lower filters.
return DexFile.isOptimizedCompilerFilter(targetCompilerFilter) ? "verify"
: targetCompilerFilter;
}
// We force vmSafeMode on debuggable apps as well: