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

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1702488 Change-Id: I2f2e239ace616bf28efb4949c53dceab09e7ad14
2021-05-12 13:19:19 +00:00
parent ac3b62b2d0 c80912849e
commit c2e953cf8a
1 changed files with 4 additions and 0 deletions
--- a/services/core/java/com/android/server/audio/AudioService.java
+++ b/services/core/java/com/android/server/audio/AudioService.java
@@ -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