Merge "audioservice: do not show volume panel when system audio is on" am: 102b795b61 (860674f0) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/audio/AudioService.java

+3 −7

Original line number	Diff line number	Diff line
		@@ -2550,17 +2550,13 @@ 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)) {
		if (mHdmiTvClient != null && mHdmiSystemAudioSupported) {
		flags &= ~AudioManager.FLAG_SHOW_UI;
		}
		}
		}
		return flags;
		}