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;");

media/java/android/media/audiopolicy/AudioProductStrategy.java

+329 −123

File changed.

Preview size limit exceeded, changes collapsed.

media/java/android/media/audiopolicy/AudioVolumeGroup.java

+18 −9
Original line number Diff line number Diff line
@@ -85,12 +85,19 @@ public final class AudioVolumeGroup implements Parcelable { 
        if (status != AudioSystem.SUCCESS) {

            Log.w(TAG, ": listAudioVolumeGroups failed");

        }

        avgList.removeIf(avg -> avg.isInternalGroup());

        return avgList;

    }



    private static native int native_list_audio_volume_groups(

            ArrayList<AudioVolumeGroup> groups);



    private boolean isInternalGroup() {

        return Arrays.stream(mAudioAttributes)

                .filter(aa -> AudioProductStrategy.isInternalAttributesForStrategy(aa))

                .findFirst().isPresent();

    }



    /**

     * @param name of the volume group

     * @param id of the volume group
@@ -200,21 +207,23 @@ public final class AudioVolumeGroup implements Parcelable { 


    @Override

    public @NonNull String toString() {

        return toString("");

    }



    String toString(String indent) {

        StringBuilder s = new StringBuilder();

        s.append("\n Name: ");

        s.append(mName);

        s.append(" Id: ");

        s.append(Integer.toString(mId));

        s.append("\n").append(indent).append("Name: ").append(mName);

        s.append(" Id: ").append(mId);



        s.append("\n     Supported Audio Attributes:");

        s.append("\n").append(indent).append(indent).append("Supported Audio Attributes:");

        for (AudioAttributes attribute : mAudioAttributes) {

            s.append("\n       -");

            s.append("\n").append(indent).append(indent).append(indent).append("-");

            s.append(attribute.toString());

        }

        s.append("\n     Supported Legacy Stream Types: { ");



        s.append("\n").append(indent).append(indent).append("Supported Legacy Stream Types: { ");

        for (int legacyStreamType : mLegacyStreamTypes) {

            s.append(Integer.toString(legacyStreamType));

            s.append(" ");

            s.append(legacyStreamType).append(" ");

        }

        s.append("}");

        return s.toString();

services/core/java/com/android/server/audio/AudioService.java

+2 −0
Original line number Diff line number Diff line
@@ -13144,6 +13144,8 @@ public class AudioService extends IAudioService.Stub 
        pw.println("\n");

        dumpSupportedSystemUsage(pw);













        AudioProductStrategy.dump(pw);



























        pw.println("\n");















        pw.println("\nSpatial audio:");















        pw.println("mHasSpatializerEffect:" + mHasSpatializerEffect + " (effect present)");