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

Commit 9f2baf18 authored by Shubham Ajmera's avatar Shubham Ajmera Committed by android-build-merger
Browse files

Merge "Fix compiler filter for downgrading unused apps" into oc-mr1-dev 

am: 15f814e3

Change-Id: Ia35c3ff6e3c8fd2af13604134051128747ba36e9
parents 81799dce 15f814e3

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

+2 −4
Original line number Diff line number Diff line
@@ -342,8 +342,7 @@ public class BackgroundDexOptService extends JobService { 
                    DexoptOptions.DEXOPT_BOOT_COMPLETE |

                    (downgrade ? DexoptOptions.DEXOPT_DOWNGRADE : 0);

            if (is_for_primary_dex) {

                int result = pm.performDexOptWithStatus(new DexoptOptions(pkg,

                        PackageManagerService.REASON_BACKGROUND_DEXOPT,

                int result = pm.performDexOptWithStatus(new DexoptOptions(pkg, reason,

                        dexoptFlags));

                success = result != PackageDexOptimizer.DEX_OPT_FAILED;

                if (result == PackageDexOptimizer.DEX_OPT_PERFORMED) {
@@ -351,8 +350,7 @@ public class BackgroundDexOptService extends JobService { 
                }

            } else {

                success = pm.performDexOpt(new DexoptOptions(pkg,

                        PackageManagerService.REASON_BACKGROUND_DEXOPT,

                        dexoptFlags | DexoptOptions.DEXOPT_ONLY_SECONDARY_DEX));

                        reason, dexoptFlags | DexoptOptions.DEXOPT_ONLY_SECONDARY_DEX));

            }

            if (success) {

                // Dexopt succeeded, remove package from the list of failing ones.