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

Commit df0c178a authored by Oscar Azucena's avatar Oscar Azucena Committed by Android (Google) Code Review
Browse files

Merge changes from topic... 

Merge changes from topic "revert-33322385-revert-33102662-STEP3_VOL_GROUP_IMPR-VKKRTPJBGK-LLGHYUMJLC" into main

* changes:
  Revert^2 "Audio: add dump in AudioVolumeGroup and Strategy"
  Revert^2 "AudioProductStrategy: add a matching score API"
  Revert "Revert "AudioProductStrategy / AudioVolumeGroups: filter..."
parents 5f9177ce 2b36e890

core/jni/android_media_AudioProductStrategies.cpp

+5 −1
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ static struct { 
    jfieldID    mVolumeGroupId;

    jfieldID    mLegacyStreamType;

    jfieldID    mAudioAttributes;

    jfieldID    mStrategyId;

} gAudioAttributesGroupsFields;



static jclass gArrayListClass;
@@ -130,6 +131,7 @@ static jint convertAudioProductStrategiesFromNative( 
                                                       gAudioAttributesGroupCstor,

                                                       jGroupId,

                                                       jLegacyStreamType,

                                                       jStrategyId,

                                                       jAudioAttributes);

        env->SetObjectArrayElement(jAudioAttributesGroups, indexGroup++, jAudioAttributesGroup);
@@ -239,11 +241,13 @@ int register_android_media_AudioProductStrategies(JNIEnv *env) 
    jclass audioAttributesGroupClass = FindClassOrDie(env, kAudioAttributesGroupsClassPathName);

    gAudioAttributesGroupClass = MakeGlobalRefOrDie(env, audioAttributesGroupClass);

    gAudioAttributesGroupCstor = GetMethodIDOrDie(env, audioAttributesGroupClass, "<init>",

                                                  "(II[Landroid/media/AudioAttributes;)V");

                                                  "(III[Landroid/media/AudioAttributes;)V");

    gAudioAttributesGroupsFields.mVolumeGroupId = GetFieldIDOrDie(

                env, audioAttributesGroupClass, "mVolumeGroupId", "I");

    gAudioAttributesGroupsFields.mLegacyStreamType = GetFieldIDOrDie(

                env, audioAttributesGroupClass, "mLegacyStreamType", "I");

    gAudioAttributesGroupsFields.mStrategyId = GetFieldIDOrDie(

                env, audioAttributesGroupClass, "mProductStrategyId", "I");

    gAudioAttributesGroupsFields.mAudioAttributes = GetFieldIDOrDie(

                env, audioAttributesGroupClass, "mAudioAttributes",

                "[Landroid/media/AudioAttributes;");