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

Commit ffac3c4b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Move AudioDeviceTypeAddr to libaudiofoundation."

parents 36e12f56 3436a246

core/jni/Android.bp

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

                "libmeminfo",

                "libaudioclient",

                "libaudiofoundation",

                "libaudiopolicy",

                "libusbhost",

                "libpdfium",

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);