summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Marvin Ramin <marvinramin@google.com> 2020-07-03 11:50:17 +0200
committer Marvin Ramin <marvinramin@google.com> 2020-07-03 11:50:17 +0200
commit1a5dc053527e51f52a05768e0048658feb12b199 (patch)
treed17f54ec584aedcca6ac2aad6948fce2cdc2e08e
parent5880788112ca02b2d3eafd0a6a587a540e40c082 (diff)
Unmute audio streams for full volume device
Moving an audio device to full volume behavior ensures all audio strams are at max volume. However muted audio streams remain muted. Full volume devices do not allow mute changes, leaving streams that are muted stuck in this state. This adds to the logic turning streams to max volume to also unmute streams if the device is in full volume behavior. BUG: 160447552 Test: manual Change-Id: Ic74108b7e2928f715d0b4773ab59284f3829eb22
-rwxr-xr-xservices/core/java/com/android/server/audio/AudioService.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java
index 4fd9ae256592..c8e4ee02e603 100755
--- a/services/core/java/com/android/server/audio/AudioService.java
+++ b/services/core/java/com/android/server/audio/AudioService.java
@@ -1320,6 +1320,11 @@ public class AudioService extends IAudioService.Stub
device, caller, true /*hasModifyAudioSettings*/);
}
mStreamStates[streamType].checkFixedVolumeDevices();
+
+ // Unmute streams if device is full volume
+ if (mFullVolumeDevices.contains(device)) {
+ mStreamStates[streamType].mute(false);
+ }
}
}