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

Merge "Register ART Service with the System Server" am: c71c3ac9ab

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

Change-Id: Ifd340682a5068a5e067f12859cc7ca06206ca6e4
This commit is contained in:
Christian Wailes
2021-04-06 20:42:48 +00:00
committed by Automerger Merge Worker
parent e9a927c672 c71c3ac9ab
commit 1feef50cc1
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

@@ -107,6 +107,7 @@ java_library {
libs: [ libs: [
"android.hidl.manager-V1.0-java", "android.hidl.manager-V1.0-java",
"framework-tethering.stubs.module_lib", "framework-tethering.stubs.module_lib",
"service-art.stubs.system_server",
], ],
// Uncomment to enable output of certain warnings (deprecated, unchecked) // Uncomment to enable output of certain warnings (deprecated, unchecked)
@@ -146,7 +147,7 @@ stubs_defaults {
" --hide DeprecationMismatch" + " --hide DeprecationMismatch" +
" --hide HiddenTypedefConstant", " --hide HiddenTypedefConstant",
visibility: ["//visibility:private"], visibility: ["//visibility:private"],
filter_packages: ["com.android."] filter_packages: ["com.android."],
} }
droidstubs { droidstubs {
@@ -161,7 +162,7 @@ droidstubs {
last_released: { last_released: {
api_file: ":android.api.system-server.latest", api_file: ":android.api.system-server.latest",
removed_api_file: ":removed.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: { api_lint: {
enabled: true, enabled: true,
@@ -171,18 +172,24 @@ droidstubs {
}, },
dists: [ dists: [
{ {
targets: ["sdk", "win_sdk"], targets: [
"sdk",
"win_sdk",
],
dir: "apistubs/android/system-server/api", dir: "apistubs/android/system-server/api",
dest: "android.txt", dest: "android.txt",
tag: ".api.txt" tag: ".api.txt",
}, },
{ {
targets: ["sdk", "win_sdk"], targets: [
"sdk",
"win_sdk",
],
dir: "apistubs/android/system-server/api", dir: "apistubs/android/system-server/api",
dest: "removed.txt", dest: "removed.txt",
tag: ".removed-api.txt", tag: ".removed-api.txt",
}, },
] ],
} }
java_library { java_library {
@@ -216,16 +223,22 @@ droidstubs {
}, },
dists: [ dists: [
{ {
targets: ["sdk", "win_sdk"], targets: [
"sdk",
"win_sdk",
],
dir: "apistubs/android/system-server/api", dir: "apistubs/android/system-server/api",
dest: "android-non-updatable.txt", 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", dir: "apistubs/android/system-server/api",
dest: "android-non-updatable-removed.tx", dest: "android-non-updatable-removed.tx",
tag: ".removed-api.txt", tag: ".removed-api.txt",
}, },
] ],
} }

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

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