From d7efb0a5b56768c6332e3b1e313e69d27cdca838 Mon Sep 17 00:00:00 2001 From: Shubang Lu Date: Wed, 1 Aug 2018 14:21:28 -0700 Subject: [PATCH] Add property to forward volume keys when system audio is off cherry-pick ag/4668430 Change-Id: I650bf974ed976d2d0083ab5b37735f297de3cd65 Fix: 80297919 Test: make --- .../java/com/android/server/hdmi/Constants.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/hdmi/Constants.java b/services/core/java/com/android/server/hdmi/Constants.java index 1f0f94a7bf0bd..5210270051c0f 100644 --- a/services/core/java/com/android/server/hdmi/Constants.java +++ b/services/core/java/com/android/server/hdmi/Constants.java @@ -300,7 +300,7 @@ final class Constants { *

Default is true. */ static final String PROPERTY_ARC_SUPPORT = - "persist.sys.hdmi.property_arc_support"; + "persist.sys.hdmi.property_arc_support"; /** * Property to save the audio port to switch to when system audio control is on. @@ -310,7 +310,7 @@ final class Constants { *

Default is ARC port. */ static final String PROPERTY_SYSTEM_AUDIO_MODE_AUDIO_PORT = - "persist.sys.hdmi.property_sytem_audio_mode_audio_port"; + "persist.sys.hdmi.property_sytem_audio_mode_audio_port"; /** * Property to save the ARC port id on system audio device. @@ -319,6 +319,15 @@ final class Constants { static final String PROPERTY_SYSTEM_AUDIO_DEVICE_ARC_PORT = "persist.sys.hdmi.property_sytem_audio_device_arc_port"; + /** + * Property to indicate if a CEC audio device should forward volume keys when system audio mode + * is off. + * + *

Default is false. + */ + static final String PROPERTY_CEC_AUDIO_DEVICE_FORWARD_VOLUME_KEYS_SYSTEM_AUDIO_MODE_OFF = + "persist.sys.hdmi.property_cec_audio_device_forward_volume_keys_system_audio_mode_off"; + /** * Property to strip local audio of amplifier and use local speaker * when TV does not support system audio mode.