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

Register ART Service with the System Server

Browse Source 
This CL causes the System Server to create and load the ART Local
Manager.

Test: Build and flash
Bug: 177273468
Change-Id: I9734160f1cd4fd9fc363b3af50e27ec8973be557
This commit is contained in:
Chris Wailes
2021-02-08 10:00:13 -08:00
parent ce2cde0427
commit 113423619e
2 changed files with 29 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
services/Android.bp
View File

@@ -114,6 +114,7 @@ java_library {
libs: [
"android.hidl.manager-V1.0-java",
"framework-tethering.stubs.module_lib",
"service-art.stubs.system_server",
],
// Uncomment to enable output of certain warnings (deprecated, unchecked)
@@ -153,7 +154,7 @@ stubs_defaults {
" --hide DeprecationMismatch" +
" --hide HiddenTypedefConstant",
visibility: ["//visibility:private"],
filter_packages: ["com.android."]
filter_packages: ["com.android."],
}
droidstubs {
@@ -168,7 +169,7 @@ droidstubs {
last_released: {
api_file: ":android.api.system-server.latest",
removed_api_file: ":removed.api.system-server.latest",
baseline_file: ":android-incompatibilities.api.system-server.latest"
baseline_file: ":android-incompatibilities.api.system-server.latest",
},
api_lint: {
enabled: true,
@@ -178,18 +179,24 @@ droidstubs {
},
dists: [
{
targets: ["sdk", "win_sdk"],
targets: [
"sdk",
"win_sdk",
],
dir: "apistubs/android/system-server/api",
dest: "android.txt",
tag: ".api.txt"
tag: ".api.txt",
},
{
targets: ["sdk", "win_sdk"],
targets: [
"sdk",
"win_sdk",
],
dir: "apistubs/android/system-server/api",
dest: "removed.txt",
tag: ".removed-api.txt",
},
]
],
}
java_library {
@@ -223,16 +230,22 @@ droidstubs {
},
dists: [
{
targets: ["sdk", "win_sdk"],
targets: [
"sdk",
"win_sdk",
],
dir: "apistubs/android/system-server/api",
dest: "android-non-updatable.txt",
tag: ".api.txt"
tag: ".api.txt",
},
{
targets: ["sdk", "win_sdk"],
targets: [
"sdk",
"win_sdk",
],
dir: "apistubs/android/system-server/api",
dest: "android-non-updatable-removed.txt",
tag: ".removed-api.txt",
},
]
}
],
}

5
services/java/com/android/server/SystemServer.java
View File

@@ -103,6 +103,7 @@ import com.android.internal.util.FrameworkStatsLog;
import com.android.internal.widget.ILockSettings;
import com.android.server.am.ActivityManagerService;
import com.android.server.appbinding.AppBindingService;
import com.android.server.art.ArtManagerLocal;
import com.android.server.attention.AttentionManagerService;
import com.android.server.audio.AudioService;
import com.android.server.biometrics.AuthService;
@@ -2610,6 +2611,10 @@ public final class SystemServer implements Dumpable {
mSystemServiceManager.startService(GAME_MANAGER_SERVICE_CLASS);
t.traceEnd();
t.traceBegin("ArtManagerLocal");
LocalManagerRegistry.addManager(ArtManagerLocal.class, new ArtManagerLocal());
t.traceEnd();
t.traceBegin("StartBootPhaseDeviceSpecificServicesReady");
mSystemServiceManager.startBootPhase(t, SystemService.PHASE_DEVICE_SPECIFIC_SERVICES_READY);
t.traceEnd();