Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9248003 authored by jiabin's avatar jiabin Committed by android-build-merger
Browse files

Merge "Move AudioDeviceTypeAddr to libaudiofoundation." 

am: 44113fe5

Change-Id: I498cd963f79925b4fa8752824cd6390f028b1dd6
parents 0b253186 44113fe5

core/jni/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -279,6 +279,7 @@ cc_library_shared { 
        "libmediametrics",

        "libmeminfo",

        "libaudioclient",

        "libaudiofoundation",

        "libaudiopolicy",

        "libjpeg",

        "libusbhost",

core/jni/android_media_AudioSystem.cpp

+3 −1
Original line number Diff line number Diff line
@@ -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);