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

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

Change-Id: I9af7417eb8b65d6e0c4526882fe16a4e8de6df78

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

@@ -5860,6 +5860,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);