diff options
| author | 2019-12-04 11:59:09 -0800 | |
|---|---|---|
| committer | 2019-12-04 11:59:09 -0800 | |
| commit | 8ddf428f533ef212443dbca5aaff0665b388b85e (patch) | |
| tree | 38aec7187c9621c583e16ab9e828c80595406954 | |
| parent | 603d7e7d8995c05e4e983e13464a94aaa13dd9df (diff) | |
| parent | b924800300b5fee3be916c7abf10ef5b54985913 (diff) | |
Merge "Move AudioDeviceTypeAddr to libaudiofoundation." am: 44113fe5ee
am: b924800300
Change-Id: I8d6b4ad80434695b83cf886ade8b917e7df4c7ba
| -rw-r--r-- | core/jni/Android.bp | 1 | ||||
| -rw-r--r-- | core/jni/android_media_AudioSystem.cpp | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/core/jni/Android.bp b/core/jni/Android.bp index 7b612776012a..49c029cb7545 100644 --- a/core/jni/Android.bp +++ b/core/jni/Android.bp @@ -279,6 +279,7 @@ cc_library_shared { "libmediametrics", "libmeminfo", "libaudioclient", + "libaudiofoundation", "libaudiopolicy", "libjpeg", "libusbhost", diff --git a/core/jni/android_media_AudioSystem.cpp b/core/jni/android_media_AudioSystem.cpp index 686a91901b5f..6417b283f520 100644 --- a/core/jni/android_media_AudioSystem.cpp +++ b/core/jni/android_media_AudioSystem.cpp @@ -27,6 +27,7 @@ #include "core_jni_helpers.h" #include <audiomanager/AudioManager.h> +#include <media/AudioDeviceTypeAddr.h> #include <media/AudioSystem.h> #include <media/AudioPolicy.h> #include <media/MicrophoneInfo.h> @@ -2015,9 +2016,10 @@ static jint android_media_AudioSystem_setUidDeviceAffinities(JNIEnv *env, jobjec if (!env->IsInstanceOf(addrJobj, stringClass)) { 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); deviceVector.add(dev); + env->ReleaseStringUTFChars((jstring) addrJobj, address); } env->ReleaseIntArrayElements(deviceTypes, typesPtr, 0); |