Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 30112998 authored by Eric Laurent's avatar Eric Laurent Committed by Automerger Merge Worker
Browse files

Merge "audio:fix STREAM_SYSTEM_ENFORCED index when camera sound forced" am:... 

Merge "audio:fix STREAM_SYSTEM_ENFORCED index when camera sound forced" am: 74e618ff am: 432f868e am: c8091284 am: c2e953cf

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

Change-Id: Iceb516c94037333a8e6f798dc2a74374ad50aaef
parents b32af9e0 c2e953cf

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

+4 −0
Original line number Diff line number Diff line
@@ -6535,6 +6535,10 @@ public class AudioService extends IAudioService.Stub 
                    if (index == -1) {

                        continue;

                    }

                    if (mPublicStreamType == AudioSystem.STREAM_SYSTEM_ENFORCED

                            && mCameraSoundForced) {

                        index = mIndexMax;

                    }

                    if (DEBUG_VOL) {

                        Log.v(TAG, "readSettings: found stored index " + getValidIndex(index)

                                 + " for group " + mAudioVolumeGroup.name() + ", device: " + name