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

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

Merge "audio: Convert getDevicesForStream to return a DeviceTypeSet"

parents 3ef14a29 acf7ba39

core/jni/android_media_AudioSystem.cpp

+3 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 


#include <android/media/AudioVibratorInfo.h>

#include <audiomanager/AudioManager.h>

#include <media/AudioContainers.h>

#include <media/AudioPolicy.h>

#include <media/AudioSystem.h>

#include <media/MicrophoneInfo.h>
@@ -813,7 +814,8 @@ android_media_AudioSystem_getMasterBalance(JNIEnv *env, jobject thiz) 
static jint

android_media_AudioSystem_getDevicesForStream(JNIEnv *env, jobject thiz, jint stream)

{

    return (jint) AudioSystem::getDevicesForStream(static_cast <audio_stream_type_t>(stream));

    return (jint)deviceTypesToBitMask(

            AudioSystem::getDevicesForStream(static_cast<audio_stream_type_t>(stream)));

}



static jint