summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Ján Sebechlebský <jsebechlebsky@google.com> 2022-10-05 11:00:49 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-10-05 11:00:49 +0000
commitd2f589c0b1fbf7fcd9dd9398fb0806a42edca38e (patch)
tree1c1cf5a0bed736aa8e0b26c4eb1fc0eb27f295f1
parent6ecbfd54c8539aca91cdb426cdee4a7254ebca1b (diff)
parent70ffaa0043b3928cb1a15d3f0c462e8ff55ee6ec (diff)
Merge "Refactor mixCriteria in AudioPolicyMix." am: 176be0e46f am: 70ffaa0043
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2238516 Change-Id: Ia2ddd6664bb5c0e7191e971db7c1c094ebe889dd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--core/jni/android_media_AudioSystem.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/jni/android_media_AudioSystem.cpp b/core/jni/android_media_AudioSystem.cpp
index 88aa4de0db24..77317d1c3c1a 100644
--- a/core/jni/android_media_AudioSystem.cpp
+++ b/core/jni/android_media_AudioSystem.cpp
@@ -2179,7 +2179,7 @@ static jint convertAudioMixToNative(JNIEnv *env,
break;
}
- nAudioMix->mCriteria.add(nCriterion);
+ nAudioMix->mCriteria.push_back(nCriterion);
env->DeleteLocalRef(jCriterion);
}