Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "CEC: Drop TODOs marked as fixed/obsolete" am: 44ab24bb22 am: 0efa9c5f25

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1690666

Change-Id: Ib3606b476cb32de6539d5f9772fd60a163f44a2f
This commit is contained in:
Treehugger Robot
2021-05-05 10:25:58 +00:00
committed by Automerger Merge Worker
parent f8042eae3d 0efa9c5f25
commit 3c30d79513
2 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceAudioSystem.java
View File

@@ -806,7 +806,6 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDeviceSource {
Arrays.stream(device.getEncodings()).mapToObj( Arrays.stream(device.getEncodings()).mapToObj(
AudioFormat::toLogFriendlyEncoding AudioFormat::toLogFriendlyEncoding
).collect(Collectors.joining(", "))); ).collect(Collectors.joining(", ")));
// TODO(b/80297701) use the actual device type that system audio mode is connected to.
if (device.getType() == AudioDeviceInfo.TYPE_HDMI_ARC) { if (device.getType() == AudioDeviceInfo.TYPE_HDMI_ARC) {
return device; return device;
} }
@@ -1225,7 +1224,6 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDeviceSource {
if (isSystemAudioActivated() && port < 0) { if (isSystemAudioActivated() && port < 0) {
// If system audio mode is on and the new active source is not under the current device, // If system audio mode is on and the new active source is not under the current device,
// Will switch to ARC input. // Will switch to ARC input.
// TODO(b/115637145): handle system aduio without ARC
routeToInputFromPortId(Constants.CEC_SWITCH_ARC); routeToInputFromPortId(Constants.CEC_SWITCH_ARC);
} else if (mIsSwitchDevice && port >= 0) { } else if (mIsSwitchDevice && port >= 0) {
// If current device is a switch and the new active source is under it, // If current device is a switch and the new active source is under it,
@@ -1326,7 +1324,6 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDeviceSource {
// Handle the system audio(ARC) part of the logic on receiving routing change or information. // Handle the system audio(ARC) part of the logic on receiving routing change or information.
private void handleRoutingChangeAndInformationForSystemAudio() { private void handleRoutingChangeAndInformationForSystemAudio() {
// TODO(b/115637145): handle system aduio without ARC
routeToInputFromPortId(Constants.CEC_SWITCH_ARC); routeToInputFromPortId(Constants.CEC_SWITCH_ARC);
} }

1
services/core/java/com/android/server/hdmi/HdmiCecMessageBuilder.java
View File

@@ -475,7 +475,6 @@ public class HdmiCecMessageBuilder {
* @return newly created {@link HdmiCecMessage} * @return newly created {@link HdmiCecMessage}
*/ */
static HdmiCecMessage buildReportShortAudioDescriptor(int src, int des, byte[] sadBytes) { static HdmiCecMessage buildReportShortAudioDescriptor(int src, int des, byte[] sadBytes) {
// TODO(b/80297701) validate.
return buildCommand(src, des, Constants.MESSAGE_REPORT_SHORT_AUDIO_DESCRIPTOR, sadBytes); return buildCommand(src, des, Constants.MESSAGE_REPORT_SHORT_AUDIO_DESCRIPTOR, sadBytes);
} }