diff options
| author | 2018-06-25 11:51:12 -0700 | |
|---|---|---|
| committer | 2018-07-13 21:10:45 +0000 | |
| commit | 743f866911bdf1f401c37456e6816f67ae6754eb (patch) | |
| tree | c8966b48ea17227d6f82a4296c42733645ee95b7 | |
| parent | 0a93f761d263e0e5672dc328cc0ec881f253d74f (diff) | |
Add system property for turn on system audio control when power on device.
Test: make -j18
Change-Id: I32275cccec10cab10dc6b86c4e8b4aa580462b7b
Bug: 80297170
(cherry picked from commit 411d7fdaab1fd99ff109b2d2f2a2049621676ad3)
Change-Id: I7d9c390160e1e79298b3fcbdc8129069b6cddbfc
| -rw-r--r-- | services/core/java/com/android/server/hdmi/Constants.java | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/hdmi/Constants.java b/services/core/java/com/android/server/hdmi/Constants.java index 0eb18a8f8cd5..3f56619d3f40 100644 --- a/services/core/java/com/android/server/hdmi/Constants.java +++ b/services/core/java/com/android/server/hdmi/Constants.java @@ -16,6 +16,7 @@ package com.android.server.hdmi; +import android.annotation.IntDef; import android.hardware.hdmi.HdmiDeviceInfo; /** @@ -200,6 +201,19 @@ final class Constants { static final int UNKNOWN_VOLUME = -1; + // States of property PROPERTY_SYSTEM_AUDIO_CONTROL_ON_POWER_ON + // to decide if turn on the system audio control when power on the device + @IntDef({ + ALWAYS_SYSTEM_AUDIO_CONTROL_ON_POWER_ON, + USE_LAST_STATE_SYSTEM_AUDIO_CONTROL_ON_POWER_ON, + NEVER_SYSTEM_AUDIO_CONTROL_ON_POWER_ON + }) + @interface SystemAudioControlOnPowerOn {} + static final int ALWAYS_SYSTEM_AUDIO_CONTROL_ON_POWER_ON = 0; + static final int USE_LAST_STATE_SYSTEM_AUDIO_CONTROL_ON_POWER_ON = 1; + static final int NEVER_SYSTEM_AUDIO_CONTROL_ON_POWER_ON = 2; + + static final String PROPERTY_PREFERRED_ADDRESS_AUDIO_SYSTEM = "persist.sys.hdmi.addr.audiosystem"; static final String PROPERTY_PREFERRED_ADDRESS_PLAYBACK = "persist.sys.hdmi.addr.playback"; @@ -221,6 +235,14 @@ final class Constants { // when it's an active source. True by default. static final String PROPERTY_KEEP_AWAKE = "persist.sys.hdmi.keep_awake"; + // TODO(UI): Set this from UI to decide if turn on System Audio Mode when power on the device + /** Property to decide if turn on the system audio control when power on the device + * Default is always turn on. + * State must be a valid {@link SystemAudioControlOnPowerOn} int. + */ + static final String PROPERTY_SYSTEM_AUDIO_CONTROL_ON_POWER_ON = + "persist.sys.hdmi.system_audio_control_on_power_on"; + static final int RECORDING_TYPE_DIGITAL_RF = 1; static final int RECORDING_TYPE_ANALOGUE_RF = 2; static final int RECORDING_TYPE_EXTERNAL_PHYSICAL_ADDRESS = 3; |