Merge "Correct buildReportAudioStatus()"

1 files changed, 2 insertions, 4 deletions

diff --git a/services/core/java/com/android/server/hdmi/HdmiCecMessageBuilder.java b/services/core/java/com/android/server/hdmi/HdmiCecMessageBuilder.java
index 79e84eea85df..37f96142089a 100644
--- a/services/core/java/com/android/server/hdmi/HdmiCecMessageBuilder.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecMessageBuilder.java
@@ -442,10 +442,8 @@ public class HdmiCecMessageBuilder {
      * @return newly created {@link HdmiCecMessage}
      */
     static HdmiCecMessage buildReportAudioStatus(int src, int dest, int volume, boolean mute) {
-        byte[] params = new byte[] {
-            mute ? (byte) (1 & 0xFF) : (byte) (0 & 0xFF),
-            (byte) (volume & 0xFF)
-        };
+        byte status = (byte) ((byte) (mute ? 1 << 7 : 0) | ((byte) volume & 0x7F));
+        byte[] params = new byte[] { status };
         return buildCommand(src, dest, Constants.MESSAGE_REPORT_AUDIO_STATUS, params);
     }