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

Commit 575c6a83 authored by Ján Sebechlebský's avatar Ján Sebechlebský Committed by Automerger Merge Worker
Browse files

Merge "Refactor mixCriteria in AudioPolicyMix." am: 176be0e4 am: 70ffaa00 am: d2f589c0 

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



Change-Id: Iaa8827e0c2f72aa2e96205a5d684369be3f2a4fb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a03a758b d2f589c0

core/jni/android_media_AudioSystem.cpp

+1 −1
Original line number Diff line number Diff line
@@ -2179,7 +2179,7 @@ static jint convertAudioMixToNative(JNIEnv *env, 
            break;

        }



        nAudioMix->mCriteria.add(nCriterion);

        nAudioMix->mCriteria.push_back(nCriterion);

        env->DeleteLocalRef(jCriterion);

    }