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

Merge "Remove DEXOPT_OTA flag." am: 8584db972c

Browse Source 
am: 3dae5ca9d6

Change-Id: I260245cc751aeea170e849f2520d1ab700ff503b
This commit is contained in:
Jeff Sharkey
2016-12-10 23:18:04 +00:00
committed by android-build-merger
parent 9ff67746e6 3dae5ca9d6
commit 91fca0f0ce
2 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/pm/Installer.java
View File

@@ -47,8 +47,6 @@ public class Installer extends SystemService {
public static final int DEXOPT_BOOTCOMPLETE = 1 << 4; public static final int DEXOPT_BOOTCOMPLETE = 1 << 4;
/** Hint that the dexopt type is profile-guided. */ /** Hint that the dexopt type is profile-guided. */
public static final int DEXOPT_PROFILE_GUIDED = 1 << 5; 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 // NOTE: keep in sync with installd
public static final int FLAG_CLEAR_CACHE_ONLY = 1 << 8; public static final int FLAG_CLEAR_CACHE_ONLY = 1 << 8;

9
services/core/java/com/android/server/pm/OtaDexoptService.java
View File

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