Merge "Add stub methods for request/report short audio descriptors." (73148629) · Commits · e / os / android_frameworks_base

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

+12 −0

Original line number	Diff line number	Diff line
		@@ -332,6 +332,10 @@ abstract class HdmiCecLocalDevice {
		return handleTimerStatus(message);
		case Constants.MESSAGE_RECORD_STATUS:
		return handleRecordStatus(message);
		case Constants.MESSAGE_REQUEST_SHORT_AUDIO_DESCRIPTOR:
		return handleRequestShortAudioDescriptor(message);
		case Constants.MESSAGE_REPORT_SHORT_AUDIO_DESCRIPTOR:
		return handleReportShortAudioDescriptor(message);
		default:
		return false;
		}
		@@ -490,6 +494,14 @@ abstract class HdmiCecLocalDevice {
		return false;
		}

		protected boolean handleRequestShortAudioDescriptor(HdmiCecMessage message) {
		return false;
		}

		protected boolean handleReportShortAudioDescriptor(HdmiCecMessage message) {
		return false;
		}

		@ServiceThreadOnly
		protected boolean handleStandby(HdmiCecMessage message) {
		assertRunOnServiceThread();

+9 −0

Original line number	Diff line number	Diff line
		@@ -205,6 +205,15 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDevice {
		return true;
		}

		@ServiceThreadOnly
		protected boolean handleRequestShortAudioDescriptor(HdmiCecMessage message) {
		assertRunOnServiceThread();
		// TODO(b/80297701): implement request short audio descriptor
		HdmiLogger.debug(TAG + "Stub handleRequestShortAudioDescriptor");
		mService.maySendFeatureAbortCommand(message, Constants.ABORT_REFUSED);
		return true;
		}

		@Override
		@ServiceThreadOnly
		protected boolean handleSystemAudioModeRequest(HdmiCecMessage message) {