diff options
| -rw-r--r-- | services/core/java/com/android/server/pm/Installer.java | 16 | ||||
| -rw-r--r-- | services/core/java/com/android/server/pm/PackageDexOptimizer.java | 6 |
2 files changed, 7 insertions, 15 deletions
diff --git a/services/core/java/com/android/server/pm/Installer.java b/services/core/java/com/android/server/pm/Installer.java index c5cefc804f7e..e6e461744094 100644 --- a/services/core/java/com/android/server/pm/Installer.java +++ b/services/core/java/com/android/server/pm/Installer.java @@ -42,22 +42,20 @@ public class Installer extends SystemService { * **************************************************************************/ /** Application should be visible to everyone */ public static final int DEXOPT_PUBLIC = 1 << 1; - /** Application wants to run in VM safe mode */ - public static final int DEXOPT_SAFEMODE = 1 << 2; /** Application wants to allow debugging of its code */ - public static final int DEXOPT_DEBUGGABLE = 1 << 3; + public static final int DEXOPT_DEBUGGABLE = 1 << 2; /** The system boot has finished */ - public static final int DEXOPT_BOOTCOMPLETE = 1 << 4; + public static final int DEXOPT_BOOTCOMPLETE = 1 << 3; /** 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 << 4; /** The compilation is for a secondary dex file. */ - public static final int DEXOPT_SECONDARY_DEX = 1 << 6; + public static final int DEXOPT_SECONDARY_DEX = 1 << 5; /** Ignore the result of dexoptNeeded and force compilation. */ - public static final int DEXOPT_FORCE = 1 << 7; + public static final int DEXOPT_FORCE = 1 << 6; /** Indicates that the dex file passed to dexopt in on CE storage. */ - public static final int DEXOPT_STORAGE_CE = 1 << 8; + public static final int DEXOPT_STORAGE_CE = 1 << 7; /** Indicates that the dex file passed to dexopt in on DE storage. */ - public static final int DEXOPT_STORAGE_DE = 1 << 9; + public static final int DEXOPT_STORAGE_DE = 1 << 8; // NOTE: keep in sync with installd public static final int FLAG_CLEAR_CACHE_ONLY = 1 << 8; diff --git a/services/core/java/com/android/server/pm/PackageDexOptimizer.java b/services/core/java/com/android/server/pm/PackageDexOptimizer.java index 8ca7b960e253..5ea6362e37fe 100644 --- a/services/core/java/com/android/server/pm/PackageDexOptimizer.java +++ b/services/core/java/com/android/server/pm/PackageDexOptimizer.java @@ -47,7 +47,6 @@ import static com.android.server.pm.Installer.DEXOPT_BOOTCOMPLETE; import static com.android.server.pm.Installer.DEXOPT_DEBUGGABLE; import static com.android.server.pm.Installer.DEXOPT_PROFILE_GUIDED; import static com.android.server.pm.Installer.DEXOPT_PUBLIC; -import static com.android.server.pm.Installer.DEXOPT_SAFEMODE; import static com.android.server.pm.Installer.DEXOPT_SECONDARY_DEX; import static com.android.server.pm.Installer.DEXOPT_FORCE; import static com.android.server.pm.Installer.DEXOPT_STORAGE_CE; @@ -404,7 +403,6 @@ public class PackageDexOptimizer { private int getDexFlags(ApplicationInfo info, String compilerFilter) { int flags = info.flags; - boolean vmSafeMode = (flags & ApplicationInfo.FLAG_VM_SAFE_MODE) != 0; boolean debuggable = (flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0; // Profile guide compiled oat files should not be public. boolean isProfileGuidedFilter = isProfileGuidedCompilerFilter(compilerFilter); @@ -412,7 +410,6 @@ public class PackageDexOptimizer { int profileFlag = isProfileGuidedFilter ? DEXOPT_PROFILE_GUIDED : 0; int dexFlags = (isPublic ? DEXOPT_PUBLIC : 0) - | (vmSafeMode ? DEXOPT_SAFEMODE : 0) | (debuggable ? DEXOPT_DEBUGGABLE : 0) | profileFlag | DEXOPT_BOOTCOMPLETE; @@ -594,9 +591,6 @@ public class PackageDexOptimizer { if ((flags & DEXOPT_PUBLIC) == DEXOPT_PUBLIC) { flagsList.add("public"); } - if ((flags & DEXOPT_SAFEMODE) == DEXOPT_SAFEMODE) { - flagsList.add("safemode"); - } if ((flags & DEXOPT_SECONDARY_DEX) == DEXOPT_SECONDARY_DEX) { flagsList.add("secondary"); } |