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

Merge "Move AudioDeviceTypeAddr to libaudiofoundation." am: 44113fe5ee

Browse Source 
am: b924800300

Change-Id: I8d6b4ad80434695b83cf886ade8b917e7df4c7ba
This commit is contained in:
jiabin
2019-12-04 11:59:09 -08:00
committed by android-build-merger
parent 603d7e7d89 b924800300
commit 8ddf428f53
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/jni/Android.bp
View File

@@ -279,6 +279,7 @@ cc_library_shared {
"libmediametrics", "libmediametrics",
"libmeminfo", "libmeminfo",
"libaudioclient", "libaudioclient",
"libaudiofoundation",
"libaudiopolicy", "libaudiopolicy",
"libjpeg", "libjpeg",
"libusbhost", "libusbhost",

4
core/jni/android_media_AudioSystem.cpp
View File

@@ -27,6 +27,7 @@
#include "core_jni_helpers.h" #include "core_jni_helpers.h"
#include <audiomanager/AudioManager.h> #include <audiomanager/AudioManager.h>
#include <media/AudioDeviceTypeAddr.h>
#include <media/AudioSystem.h> #include <media/AudioSystem.h>
#include <media/AudioPolicy.h> #include <media/AudioPolicy.h>
#include <media/MicrophoneInfo.h> #include <media/MicrophoneInfo.h>
@@ -2015,9 +2016,10 @@ static jint android_media_AudioSystem_setUidDeviceAffinities(JNIEnv *env, jobjec
if (!env->IsInstanceOf(addrJobj, stringClass)) { if (!env->IsInstanceOf(addrJobj, stringClass)) {
return (jint) AUDIO_JAVA_BAD_VALUE; return (jint) AUDIO_JAVA_BAD_VALUE;
} }
String8 address = String8(env->GetStringUTFChars((jstring) addrJobj, NULL)); const char* address = env->GetStringUTFChars((jstring) addrJobj, NULL);
AudioDeviceTypeAddr dev = AudioDeviceTypeAddr(typesPtr[i], address); AudioDeviceTypeAddr dev = AudioDeviceTypeAddr(typesPtr[i], address);
deviceVector.add(dev); deviceVector.add(dev);
env->ReleaseStringUTFChars((jstring) addrJobj, address);
} }
env->ReleaseIntArrayElements(deviceTypes, typesPtr, 0); env->ReleaseIntArrayElements(deviceTypes, typesPtr, 0);