From 111725d1ea1968f341a07c93e08aed7be0f84e82 Mon Sep 17 00:00:00 2001
From: jiabin <jiabin@google.com>
Date: Mon, 4 Nov 2019 14:16:21 -0800
Subject: Move AudioDeviceTypeAddr to libaudiofoundation.

As AudioDeviceTypeAddr moving to libaudiofoundation, adding the shared
library accordingly.

Test: make
Bug: 135621476
Change-Id: Ie79ba81bf8972cf30a538c9c1f8d973db2359bbe
Merged-In: Ie79ba81bf8972cf30a538c9c1f8d973db2359bbe
---
 core/jni/Android.bp                    | 1 +
 core/jni/android_media_AudioSystem.cpp | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

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);
 
-- 
cgit v1.2.3-59-g8ed1b