Merge "SystemServer: Support deviceSpecificAudioService for ARC" (2112895b) · Commits · e / os / android_frameworks_base

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

+14 −1

Original line number	Diff line number	Diff line
		@@ -819,6 +819,9 @@ public final class SystemServer {
		boolean isWatch = context.getPackageManager().hasSystemFeature(
		PackageManager.FEATURE_WATCH);

		boolean isArc = context.getPackageManager().hasSystemFeature(
		"org.chromium.arc");

		boolean enableVrService = context.getPackageManager().hasSystemFeature(
		PackageManager.FEATURE_VR_MODE_HIGH_PERFORMANCE);

		@@ -1341,7 +1344,17 @@ public final class SystemServer {
		}

		traceBeginAndSlog("StartAudioService");
		if (!isArc) {
		mSystemServiceManager.startService(AudioService.Lifecycle.class);
		} else {
		String className = context.getResources()
		.getString(R.string.config_deviceSpecificAudioService);
		try {
		mSystemServiceManager.startService(className + "$Lifecycle");
		} catch (Throwable e) {
		reportWtf("starting " + className, e);
		}
		}
		traceEnd();

		if (mPackageManager.hasSystemFeature(PackageManager.FEATURE_BROADCAST_RADIO)) {