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

Commit 432f868e 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: 74e618ff 

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

Change-Id: I4a09b92dcc9d06265faa6eb9bafb42b8ca36214b
parents b24386b5 74e618ff

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

+4 −0
Original line number Original line Diff line number Diff line
@@ -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);