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

Merge "[AudioServer] Fix CTS for volume groups based on non public streams" am: 99f24661cb

Browse Source 
Change-Id: Ic02cb59211ecd78c73ba5d5f6105d697a22af2ec
This commit is contained in:
Treehugger Robot
2020-04-07 19:04:30 +00:00
committed by Automerger Merge Worker
parent 8c5c4b55a9 99f24661cb
commit 9c542555fe
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2156,6 +2156,13 @@ public class AudioService extends IAudioService.Stub
// For legacy reason, propagate to all streams associated to this volume group // For legacy reason, propagate to all streams associated to this volume group
for (final int groupedStream : vgs.getLegacyStreamTypes()) { for (final int groupedStream : vgs.getLegacyStreamTypes()) {
try {
ensureValidStreamType(groupedStream);
} catch (IllegalArgumentException e) {
Log.d(TAG, "volume group " + volumeGroup + " has internal streams (" + groupedStream
+ "), do not change associated stream volume");
continue;
}
setStreamVolume(groupedStream, index, flags, callingPackage, callingPackage, setStreamVolume(groupedStream, index, flags, callingPackage, callingPackage,
Binder.getCallingUid()); Binder.getCallingUid());
} }