From 288e3f50dd3ae5288566fde969ef547816babace Mon Sep 17 00:00:00 2001
From: Andreas Gampe <agampe@google.com>
Date: Tue, 29 Mar 2016 10:52:33 -0700
Subject: [PATCH] Frameworks/base: Refactor package manager

Minimal cherry-pick to keep things alive.

Bug: 27689078

(cherry picked from commit bdd30d86ef98456161069d11481b2ccd25a11b4e)

Change-Id: I06b9d75f58c59cb07ef5170f784ea6745168efaa
---
 core/java/com/android/internal/os/ZygoteInit.java             | 2 +-
 .../core/java/com/android/server/pm/PackageDexOptimizer.java  | 2 +-
 .../java/com/android/server/pm/PackageManagerService.java     | 4 ++--
 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 48a79bb587533..a91ad51eeacdf 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 1e4d4a3306e99..8fb05a4047ba8 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 ef79eb84f75d3..7ea9038cc2c5b 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*/);