Merge "Fix arguments capture in SoundEffectsHelper" into rvc-dev am: cc91c675cf am: 7e098c1798

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

Change-Id: Ib1a4c2a96fdfe8b50cf7bb63533519b87067ad2c

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

@@ -436,11 +436,12 @@ class SoundEffectsHelper {
                     onUnloadSoundEffects();
                     break;
                 case MSG_PLAY_EFFECT:
+                    final int effect = msg.arg1, volume = msg.arg2;
                     onLoadSoundEffects(new OnEffectsLoadCompleteHandler() {
                         @Override
                         public void run(boolean success) {
                             if (success) {
-                                onPlaySoundEffect(msg.arg1 /*effect*/, msg.arg2 /*volume*/);
+                                onPlaySoundEffect(effect, volume);
                             }
                         }
                     });