Merge "Add stub handlers for audio system device." (7af6c8ca) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceAudioSystem.java

+42 −4

Original line number	Original line	Diff line number	Diff line
	@@ -15,9 +15,9 @@
	*/		*/
	package com.android.server.hdmi;		package com.android.server.hdmi;


	import android.hardware.hdmi.HdmiDeviceInfo;		import android.hardware.hdmi.HdmiDeviceInfo;
	import android.os.SystemProperties;		import android.os.SystemProperties;
			import com.android.server.hdmi.HdmiAnnotations.ServiceThreadOnly;

	/**		/**
	* Represent a logical device of type {@link HdmiDeviceInfo#DEVICE_AUDIO_SYSTEM} residing in		* Represent a logical device of type {@link HdmiDeviceInfo#DEVICE_AUDIO_SYSTEM} residing in
	@@ -25,12 +25,14 @@ import android.os.SystemProperties;
	*/		*/
	public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDevice {		public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDevice {

			private static final String TAG = "HdmiCecLocalDeviceAudioSystem";

	protected HdmiCecLocalDeviceAudioSystem(HdmiControlService service) {		protected HdmiCecLocalDeviceAudioSystem(HdmiControlService service) {
	super(service, HdmiDeviceInfo.DEVICE_AUDIO_SYSTEM);		super(service, HdmiDeviceInfo.DEVICE_AUDIO_SYSTEM);
	}		}

	@Override		@Override
	@HdmiAnnotations.ServiceThreadOnly		@ServiceThreadOnly
	protected void onAddressAllocated(int logicalAddress, int reason) {		protected void onAddressAllocated(int logicalAddress, int reason) {
	assertRunOnServiceThread();		assertRunOnServiceThread();
	mService.sendCecCommand(HdmiCecMessageBuilder.buildReportPhysicalAddressCommand(		mService.sendCecCommand(HdmiCecMessageBuilder.buildReportPhysicalAddressCommand(
	@@ -41,7 +43,7 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDevice {
	}		}

	@Override		@Override
	@HdmiAnnotations.ServiceThreadOnly		@ServiceThreadOnly
	protected int getPreferredAddress() {		protected int getPreferredAddress() {
	assertRunOnServiceThread();		assertRunOnServiceThread();
	return SystemProperties.getInt(Constants.PROPERTY_PREFERRED_ADDRESS_AUDIO_SYSTEM,		return SystemProperties.getInt(Constants.PROPERTY_PREFERRED_ADDRESS_AUDIO_SYSTEM,
	@@ -49,10 +51,46 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDevice {
	}		}

	@Override		@Override
	@HdmiAnnotations.ServiceThreadOnly		@ServiceThreadOnly
	protected void setPreferredAddress(int addr) {		protected void setPreferredAddress(int addr) {
	assertRunOnServiceThread();		assertRunOnServiceThread();
	SystemProperties.set(Constants.PROPERTY_PREFERRED_ADDRESS_AUDIO_SYSTEM,		SystemProperties.set(Constants.PROPERTY_PREFERRED_ADDRESS_AUDIO_SYSTEM,
	String.valueOf(addr));		String.valueOf(addr));
	}		}

			@Override
			@ServiceThreadOnly
			protected boolean handleReportAudioStatus(HdmiCecMessage message) {
			assertRunOnServiceThread();
			// TODO(amyjojo): implement report audio status handler
			HdmiLogger.debug(TAG + "Stub handleReportAudioStatus");
			return true;
			}

			@Override
			@ServiceThreadOnly
			protected boolean handleInitiateArc(HdmiCecMessage message) {
			assertRunOnServiceThread();
			// TODO(amyjojo): implement initiate arc handler
			HdmiLogger.debug(TAG + "Stub handleInitiateArc");
			return true;
			}

			@Override
			@ServiceThreadOnly
			protected boolean handleReportArcInitiate(HdmiCecMessage message) {
			assertRunOnServiceThread();
			// TODO(amyjojo): implement report arc initiate handler
			HdmiLogger.debug(TAG + "Stub handleReportArcInitiate");
			return true;
			}

			@Override
			@ServiceThreadOnly
			protected boolean handleReportArcTermination(HdmiCecMessage message) {
			assertRunOnServiceThread();
			// TODO(amyjojo): implement report arc terminate handler
			HdmiLogger.debug(TAG + "Stub handleReportArcTermination");
			return true;
			}
	}		}