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

Commit 12101def authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix MixMatchCriterion conversion from native side" into main

parents 0add2b34 564e7d67

core/jni/android_media_AudioSystem.cpp

+2 −2
Original line number Diff line number Diff line
@@ -2292,7 +2292,7 @@ static jint nativeAudioMixToJavaAudioMixingRule(JNIEnv *env, const AudioMix &nAu 
                                 criteria.mValue.mUsage);

                jMixMatchCriterion = env->NewObject(gAudioMixMatchCriterionClass,

                                                    gAudioMixMatchCriterionAttrCstor,

                                                    jMixMatchCriterion, criteria.mRule);

                                                    jAudioAttributes, criteria.mRule);

                break;

            case RULE_MATCH_ATTRIBUTE_CAPTURE_PRESET:

                jAudioAttributes = env->NewObject(gAudioAttributesClass, gAudioAttributesCstor);
@@ -2300,7 +2300,7 @@ static jint nativeAudioMixToJavaAudioMixingRule(JNIEnv *env, const AudioMix &nAu 
                                 criteria.mValue.mSource);

                jMixMatchCriterion = env->NewObject(gAudioMixMatchCriterionClass,

                                                    gAudioMixMatchCriterionAttrCstor,

                                                    jMixMatchCriterion, criteria.mRule);

                                                    jAudioAttributes, criteria.mRule);

                break;

        }

        env->CallBooleanMethod(jAudioMixMatchCriterionList, gArrayListMethods.add,

media/java/android/media/AudioAttributes.java

+2 −0
Original line number Diff line number Diff line
@@ -578,6 +578,8 @@ public final class AudioAttributes implements Parcelable { 
    });



    private AudioAttributes() {

        mBundle = null;

        mFormattedTags = "";

    }



    /**