Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 46fd870e authored by Andreas Gampe's avatar Andreas Gampe Committed by android-build-merger
Browse files

Merge "Frameworks/base: Refactor package manager" 

am: 453a77c7

* commit '453a77c7':
  Frameworks/base: Refactor package manager

Change-Id: Ia8003f32edfa9cb22e4e2378c2b733a736cb8da1
parents ae975aba 453a77c7

core/java/com/android/internal/os/ZygoteInit.java

+1 −1
Original line number Diff line number Diff line
@@ -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*/);

services/core/java/com/android/server/pm/PackageDexOptimizer.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

services/core/java/com/android/server/pm/PackageManagerService.java

+2 −2
Original line number Diff line number Diff line
@@ -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*/);