Merge "Remove DEXOPT_OTA flag."

am: 8584db972c

Change-Id: I706f3d92b15f169f0ec877e95bac224bb90c2033
This commit is contained in:
Jeff Sharkey
2016-12-10 23:06:56 +00:00
committed by android-build-merger
2 changed files with 0 additions and 11 deletions

View File

@@ -47,8 +47,6 @@ public class Installer extends SystemService {
public static final int DEXOPT_BOOTCOMPLETE = 1 << 4;
/** Hint that the dexopt type is profile-guided. */
public static final int DEXOPT_PROFILE_GUIDED = 1 << 5;
/** This is an OTA update dexopt */
public static final int DEXOPT_OTA = 1 << 6;
// NOTE: keep in sync with installd
public static final int FLAG_CLEAR_CACHE_ONLY = 1 << 8;

View File

@@ -16,7 +16,6 @@
package com.android.server.pm;
import static com.android.server.pm.Installer.DEXOPT_OTA;
import static com.android.server.pm.InstructionSets.getAppDexInstructionSets;
import static com.android.server.pm.InstructionSets.getDexCodeInstructionSets;
import static com.android.server.pm.PackageManagerServiceCompilerMapping.getCompilerFilterForReason;
@@ -421,18 +420,10 @@ public class OtaDexoptService extends IOtaDexopt.Stub {
private static class OTADexoptPackageDexOptimizer extends
PackageDexOptimizer.ForcedUpdatePackageDexOptimizer {
public OTADexoptPackageDexOptimizer(Installer installer, Object installLock,
Context context) {
super(installer, installLock, context, "*otadexopt*");
}
@Override
protected int adjustDexoptFlags(int dexoptFlags) {
// Add the OTA flag.
return dexoptFlags | DEXOPT_OTA;
}
}
/**