Merge changes from topic 'secondary-dex'

am: 9e88c53337

Change-Id: I77e80eaf9274a64348c80b251e865ecdb6e53dbc
This commit is contained in:
Calin Juravle
2017-03-03 00:13:57 +00:00
committed by android-build-merger

View File

@@ -252,7 +252,7 @@ public class BackgroundDexOptService extends JobService {
return result;
}
if (SystemProperties.getBoolean("dalvik.vm.deopt.secondary", false)) {
if (SystemProperties.getBoolean("dalvik.vm.dexopt.secondary", false)) {
result = reconcileSecondaryDexFiles(pm.getDexManager());
if (result == OPTIMIZE_ABORT_BY_JOB_SCHEDULER) {
return result;