Merge "Register ART Service with the System Server" am: c71c3ac9ab (1feef50c) · Commits · e / os / android_frameworks_base

services/Android.bp

+24 −11

Original line number	Diff line number	Diff line
		@@ -107,6 +107,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)
		@@ -146,7 +147,7 @@ stubs_defaults {
		" --hide DeprecationMismatch" +
		" --hide HiddenTypedefConstant",
		visibility: ["//visibility:private"],
		filter_packages: ["com.android."]
		filter_packages: ["com.android."],
		}

		droidstubs {
		@@ -161,7 +162,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,
		@@ -171,18 +172,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 {
		@@ -216,16 +223,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.tx",
		tag: ".removed-api.txt",
		},
		]
		],
		}

services/java/com/android/server/SystemServer.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -96,6 +96,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;
		@@ -2330,6 +2331,10 @@ public final class SystemServer {
		}
		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();