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

Commit e394c59a authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Automerger Merge Worker
Browse files

Merge "Wait for installd to start to perform dexopt operation" am: 3f0f0b68... 

Merge "Wait for installd to start to perform dexopt operation" am: 3f0f0b68 am: ee20cc3c am: d2cd30f2

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1615847

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I01a6b4f516ee1e74707babc10e5846d5cbfb61fe
parents 219aea8c d2cd30f2

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

+4 −2
Original line number Diff line number Diff line
@@ -651,8 +651,6 @@ public class ZygoteInit { 
     */

    private static void performSystemServerDexOpt(String classPath) {

        final String[] classPathElements = classPath.split(":");

        final IInstalld installd = IInstalld.Stub

                .asInterface(ServiceManager.getService("installd"));

        final String instructionSet = VMRuntime.getRuntime().vmInstructionSet();



        String classPathForElement = "";
@@ -689,6 +687,10 @@ public class ZygoteInit { 
                final String uuid = StorageManager.UUID_PRIVATE_INTERNAL;

                final String seInfo = null;

                final int targetSdkVersion = 0;  // SystemServer targets the system's SDK version

                // Wait for installd to be made available

                IInstalld installd = IInstalld.Stub.asInterface(

                        ServiceManager.waitForService("installd"));



                try {

                    installd.dexopt(classPathElement, Process.SYSTEM_UID, packageName,

                            instructionSet, dexoptNeeded, outputPath, dexFlags, systemServerFilter,