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

Commit a400ccda authored by Calin Juravle's avatar Calin Juravle Committed by android-build-merger
Browse files

Merge changes from topic 'secondary-dex' 

am: 9e88c533

Change-Id: I77e80eaf9274a64348c80b251e865ecdb6e53dbc
parents ade90057 9e88c533

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -252,7 +252,7 @@ public class BackgroundDexOptService extends JobService { 
            return result;

            return result;

        }

        }





        if (SystemProperties.getBoolean("dalvik.vm.deopt.secondary", false)) {

        if (SystemProperties.getBoolean("dalvik.vm.dexopt.secondary", false)) {

            result = reconcileSecondaryDexFiles(pm.getDexManager());

            result = reconcileSecondaryDexFiles(pm.getDexManager());

            if (result == OPTIMIZE_ABORT_BY_JOB_SCHEDULER) {

            if (result == OPTIMIZE_ABORT_BY_JOB_SCHEDULER) {

                return result;

                return result;