Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[BUG] AudioService: fix stategy/groups attributes introspection" am: d3cd42362b am: b2297eefe7 am: a4d5b622d6

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

Change-Id: I4ec1c9fc2ddd7e7cf2a5a8df43ae2699b7c8c79b
This commit is contained in:
Eric Laurent
2021-12-08 16:19:02 +00:00
committed by Automerger Merge Worker
parent 732d80927d a4d5b622d6
commit e4a1478252
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/jni/android_media_AudioAttributes.cpp
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",