From f5246639670fbb955bece57f7a42466a8b4eec51 Mon Sep 17 00:00:00 2001 From: Treehugger Robot Date: Fri, 5 Jun 2020 06:11:12 +0000 Subject: [PATCH] Merge "Remove mute key if no Report Audio Status received." am: 0156e0518c am: d42536b334 am: b74d3b4dfc am: 2bd1a0bbd0 am: 85bf46fcfc Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/968228 Bug: 133375546 Change-Id: I35cc834aa1aa8d2280ac2cc58fe359e3592d9bda (cherry picked from commit c8ebcea30a5dd036f5026057eedbabd555a310d1) --- .../com/android/server/hdmi/SystemAudioStatusAction.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/services/core/java/com/android/server/hdmi/SystemAudioStatusAction.java b/services/core/java/com/android/server/hdmi/SystemAudioStatusAction.java index 13f0f4ae4a925..5d913d12b79ff 100644 --- a/services/core/java/com/android/server/hdmi/SystemAudioStatusAction.java +++ b/services/core/java/com/android/server/hdmi/SystemAudioStatusAction.java @@ -64,12 +64,6 @@ final class SystemAudioStatusAction extends HdmiCecFeatureAction { } private void handleSendGiveAudioStatusFailure() { - // Inform to all application that the audio status (volume, mute) of - // the audio amplifier is unknown. - tv().setAudioStatus(false, Constants.UNKNOWN_VOLUME); - - sendUserControlPressedAndReleased(mAvrAddress, - HdmiCecKeycode.getMuteKey(!tv().isSystemAudioActivated())); // Still return SUCCESS to callback. finishWithCallback(HdmiControlManager.RESULT_SUCCESS);