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

Commit b2297eef authored by Eric Laurent's avatar Eric Laurent Committed by Automerger Merge Worker
Browse files

Merge "[BUG] AudioService: fix stategy/groups attributes introspection" am: d3cd4236 

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

Change-Id: If65426d0aa6f32165d21161cf5b6b1662cfdb46e
parents ac7bb16e d3cd4236

core/jni/android_media_AudioAttributes.cpp

+4 −4
Original line number Original line Diff line number Diff line
@@ -58,7 +58,7 @@ static struct { 
    jmethodID setSystemUsage;

    jmethodID setSystemUsage;

    jmethodID setInternalCapturePreset;

    jmethodID setInternalCapturePreset;

    jmethodID setContentType;

    jmethodID setContentType;

    jmethodID setFlags;

    jmethodID replaceFlags;

    jmethodID addTag;

    jmethodID addTag;

} gAudioAttributesBuilderMethods;

} gAudioAttributesBuilderMethods;
@@ -130,7 +130,7 @@ static jint nativeAudioAttributesToJavaAudioAttributes( 
                          gAudioAttributesBuilderMethods.setContentType,

                          gAudioAttributesBuilderMethods.setContentType,

                          attributes.content_type);

                          attributes.content_type);

    env->CallObjectMethod(jAttributeBuilder.get(),

    env->CallObjectMethod(jAttributeBuilder.get(),

                          gAudioAttributesBuilderMethods.setFlags,

                          gAudioAttributesBuilderMethods.replaceFlags,

                          attributes.flags);

                          attributes.flags);

    env->CallObjectMethod(jAttributeBuilder.get(),

    env->CallObjectMethod(jAttributeBuilder.get(),

                          gAudioAttributesBuilderMethods.addTag,

                          gAudioAttributesBuilderMethods.addTag,
@@ -205,8 +205,8 @@ int register_android_media_AudioAttributes(JNIEnv *env) 
    gAudioAttributesBuilderMethods.setContentType = GetMethodIDOrDie(

    gAudioAttributesBuilderMethods.setContentType = GetMethodIDOrDie(

                env, audioAttributesBuilderClass, "setContentType",

                env, audioAttributesBuilderClass, "setContentType",

                "(I)Landroid/media/AudioAttributes$Builder;");

                "(I)Landroid/media/AudioAttributes$Builder;");

    gAudioAttributesBuilderMethods.setFlags = GetMethodIDOrDie(

    gAudioAttributesBuilderMethods.replaceFlags = GetMethodIDOrDie(

                env, audioAttributesBuilderClass, "setFlags",

                env, audioAttributesBuilderClass, "replaceFlags",

                "(I)Landroid/media/AudioAttributes$Builder;");

                "(I)Landroid/media/AudioAttributes$Builder;");

    gAudioAttributesBuilderMethods.addTag = GetMethodIDOrDie(

    gAudioAttributesBuilderMethods.addTag = GetMethodIDOrDie(

                env, audioAttributesBuilderClass, "addTag",

                env, audioAttributesBuilderClass, "addTag",