Merge "No IVolumeController updates for invalid stream type" into main (7d1c6e21) · Commits · e / os / android_frameworks_base

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -5441,6 +5441,10 @@ public class AudioService extends IAudioService.Stub
		protected void sendVolumeUpdate(int streamType, int oldIndex, int index, int flags, int device)
		{
		streamType = sStreamVolumeAlias.get(streamType, /valueIfKeyNotFound=/-1);
		if (streamType == -1) {
		Slog.e(TAG, "Invalid stream type. No update to IVolumeController", new Exception());
		return;
		}

		if (streamType == AudioSystem.STREAM_MUSIC && isFullVolumeDevice(device)) {
		flags &= ~AudioManager.FLAG_SHOW_UI;