Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I77a5719fe279c066386fbff2c279bb4caee3c052
This commit is contained in:
Jeff Sharkey
2021-03-09 23:23:24 +00:00
committed by Automerger Merge Worker
parent 4651bc7b96 3f0f0b686a
commit ee20cc3ca1
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/com/android/internal/os/ZygoteInit.java
View File

@@ -648,8 +648,6 @@ public class ZygoteInit {
*/ */
private static void performSystemServerDexOpt(String classPath) { private static void performSystemServerDexOpt(String classPath) {
final String[] classPathElements = classPath.split(":"); final String[] classPathElements = classPath.split(":");
final IInstalld installd = IInstalld.Stub
.asInterface(ServiceManager.getService("installd"));
final String instructionSet = VMRuntime.getRuntime().vmInstructionSet(); final String instructionSet = VMRuntime.getRuntime().vmInstructionSet();
String classPathForElement = ""; String classPathForElement = "";
@@ -686,6 +684,10 @@ public class ZygoteInit {
final String uuid = StorageManager.UUID_PRIVATE_INTERNAL; final String uuid = StorageManager.UUID_PRIVATE_INTERNAL;
final String seInfo = null; final String seInfo = null;
final int targetSdkVersion = 0; // SystemServer targets the system's SDK version 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 { try {
installd.dexopt(classPathElement, Process.SYSTEM_UID, packageName, installd.dexopt(classPathElement, Process.SYSTEM_UID, packageName,
instructionSet, dexoptNeeded, outputPath, dexFlags, systemServerFilter, instructionSet, dexoptNeeded, outputPath, dexFlags, systemServerFilter,