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

This commit is contained in:
Eric Laurent
2021-12-08 15:15:12 +00:00
committed by Gerrit Code Review

View File

@@ -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",