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

Merge "audioservice: do not show volume panel when system audio is on" am: 102b795b61

Browse Source 
am: f73668be43

Change-Id: If04fb012169486d771384f6376be69f87358a121
This commit is contained in:
Eric Laurent
2019-09-09 17:44:31 -07:00
committed by android-build-merger
parent c6eb63ba8e f73668be43
commit 860674f08a
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/audio/AudioService.java
View File

@@ -2550,15 +2550,11 @@ public class AudioService extends IAudioService.Stub
mVolumeController.postVolumeChanged(streamType, flags);
}
// If Hdmi-CEC system audio mode is on, we show volume bar only when TV
// receives volume notification from Audio Receiver.
// If Hdmi-CEC system audio mode is on and we are a TV panel, never show volume bar.
private int updateFlagsForTvPlatform(int flags) {
synchronized (mHdmiClientLock) {
if (mHdmiTvClient != null) {
if (mHdmiSystemAudioSupported &&
((flags & AudioManager.FLAG_HDMI_SYSTEM_AUDIO_VOLUME) == 0)) {
flags &= ~AudioManager.FLAG_SHOW_UI;
}
if (mHdmiTvClient != null && mHdmiSystemAudioSupported) {
flags &= ~AudioManager.FLAG_SHOW_UI;
}
}
return flags;