summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Andreas Gampe <agampe@google.com> 2016-03-29 21:24:18 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2016-03-29 21:24:19 +0000
commit453a77c702f0c857b4900aeb5772e37d0a309b1f (patch)
treed073ef0151c3bb550c96f5b53fa0628be7340058
parent71604596117c02a885da356cd0015c29493e48bc (diff)
parent288e3f50dd3ae5288566fde969ef547816babace (diff)
Merge "Frameworks/base: Refactor package manager"
-rw-r--r--core/java/com/android/internal/os/ZygoteInit.java2
-rw-r--r--services/core/java/com/android/server/pm/PackageDexOptimizer.java2
-rw-r--r--services/core/java/com/android/server/pm/PackageManagerService.java4
3 files changed, 4 insertions, 4 deletions
diff --git a/core/java/com/android/internal/os/ZygoteInit.java b/core/java/com/android/internal/os/ZygoteInit.java
index 48a79bb58753..a91ad51eeacd 100644
--- a/core/java/com/android/internal/os/ZygoteInit.java
+++ b/core/java/com/android/internal/os/ZygoteInit.java
@@ -484,7 +484,7 @@ public class ZygoteInit {
try {
for (String classPathElement : classPathElements) {
final int dexoptNeeded = DexFile.getDexOptNeeded(
- classPathElement, instructionSet, DexFile.COMPILATION_TYPE_FULL);
+ classPathElement, instructionSet, "speed", false /* newProfile */);
if (dexoptNeeded != DexFile.NO_DEXOPT_NEEDED) {
installer.dexopt(classPathElement, Process.SYSTEM_UID, instructionSet,
dexoptNeeded, 0 /*dexFlags*/);
diff --git a/services/core/java/com/android/server/pm/PackageDexOptimizer.java b/services/core/java/com/android/server/pm/PackageDexOptimizer.java
index 1e4d4a3306e9..8fb05a4047ba 100644
--- a/services/core/java/com/android/server/pm/PackageDexOptimizer.java
+++ b/services/core/java/com/android/server/pm/PackageDexOptimizer.java
@@ -146,7 +146,7 @@ final class PackageDexOptimizer {
} else {
try {
dexoptNeeded = DexFile.getDexOptNeeded(path,
- dexCodeInstructionSet, DexFile.COMPILATION_TYPE_FULL);
+ dexCodeInstructionSet, "speed-profile", useJit);
} catch (IOException ioe) {
Slog.w(TAG, "IOException reading apk: " + path, ioe);
return DEX_OPT_FAILED;
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index ef79eb84f75d..7ea9038cc2c5 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -1981,7 +1981,7 @@ public class PackageManagerService extends IPackageManager.Stub {
try {
int dexoptNeeded = DexFile.getDexOptNeeded(lib, dexCodeInstructionSet,
- DexFile.COMPILATION_TYPE_FULL);
+ "speed", false);
if (dexoptNeeded != DexFile.NO_DEXOPT_NEEDED) {
alreadyDexOpted.add(lib);
mInstaller.dexopt(lib, Process.SYSTEM_UID, dexCodeInstructionSet,
@@ -2032,7 +2032,7 @@ public class PackageManagerService extends IPackageManager.Stub {
}
try {
int dexoptNeeded = DexFile.getDexOptNeeded(path, dexCodeInstructionSet,
- DexFile.COMPILATION_TYPE_FULL);
+ "speed", false);
if (dexoptNeeded != DexFile.NO_DEXOPT_NEEDED) {
mInstaller.dexopt(path, Process.SYSTEM_UID, dexCodeInstructionSet,
dexoptNeeded, DEXOPT_PUBLIC /*dexFlags*/);