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

Merge "audio:fix STREAM_SYSTEM_ENFORCED index when camera sound forced" am: 74e618ff8b am: 432f868e78

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1702488

Change-Id: I9af7417eb8b65d6e0c4526882fe16a4e8de6df78
This commit is contained in:
Eric Laurent
2021-05-12 13:04:01 +00:00
committed by Automerger Merge Worker
parent f33515f618 432f868e78
commit c80912849e
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5860,6 +5860,10 @@ public class AudioService extends IAudioService.Stub
if (index == -1) { if (index == -1) {
continue; continue;
} }
if (mPublicStreamType == AudioSystem.STREAM_SYSTEM_ENFORCED
&& mCameraSoundForced) {
index = mIndexMax;
}
if (DEBUG_VOL) { if (DEBUG_VOL) {
Log.v(TAG, "readSettings: found stored index " + getValidIndex(index) Log.v(TAG, "readSettings: found stored index " + getValidIndex(index)
+ " for group " + mAudioVolumeGroup.name() + ", device: " + name); + " for group " + mAudioVolumeGroup.name() + ", device: " + name);