Add stub methods for request/report short audio descriptors.
Bug: 80297701
Test: m -j services.core
Change-Id: I0d66da828d4c4d1be59a0906e612902a49894542
(cherry picked from commit 7866e151f3439833d08abb8ec005891f8926a677)
diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDevice.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDevice.java
index 1dd10f5..6a32d5c 100755
--- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDevice.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDevice.java
@@ -324,6 +324,10 @@
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;
}
@@ -479,6 +483,14 @@
return false;
}
+ protected boolean handleRequestShortAudioDescriptor(HdmiCecMessage message) {
+ return false;
+ }
+
+ protected boolean handleReportShortAudioDescriptor(HdmiCecMessage message) {
+ return false;
+ }
+
@ServiceThreadOnly
protected boolean handleStandby(HdmiCecMessage message) {
assertRunOnServiceThread();
diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceAudioSystem.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceAudioSystem.java
index b25287c..27f13f8 100644
--- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceAudioSystem.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceAudioSystem.java
@@ -201,6 +201,15 @@
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) {