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

Commit 8eb40b65 authored by ESWAR MAGATAPALLI (xWF)'s avatar ESWAR MAGATAPALLI (xWF) Committed by Android (Google) Code Review
Browse files

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

* changes:
  Revert "AudioProductStrategy / AudioVolumeGroups: filters internals"
  Revert "AudioProductStrategy: add a matching score API"
  Revert "Audio: add dump in AudioVolumeGroup and Strategy"
parents 0d42216b 39d41c88

core/jni/android_media_AudioProductStrategies.cpp

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

    jfieldID    mLegacyStreamType;

    jfieldID    mAudioAttributes;

    jfieldID    mStrategyId;

} gAudioAttributesGroupsFields;



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

                                                       jGroupId,

                                                       jLegacyStreamType,

                                                       jStrategyId,

                                                       jAudioAttributes);

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

    gAudioAttributesGroupClass = MakeGlobalRefOrDie(env, audioAttributesGroupClass);

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

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

                                                  "(II[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;");