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

Commit d21267a2 authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by Android (Google) Code Review
Browse files

Merge "Add support for querying whether the music stream is active remotely"

parents de1fadfb 679d5046

core/jni/android_media_AudioSystem.cpp

+10 −0
Original line number Diff line number Diff line
@@ -75,6 +75,15 @@ android_media_AudioSystem_isStreamActive(JNIEnv *env, jobject thiz, jint stream, 
    return state;

}



static jboolean

android_media_AudioSystem_isStreamActiveRemotely(JNIEnv *env, jobject thiz, jint stream,

        jint inPastMs)

{

    bool state = false;

    AudioSystem::isStreamActiveRemotely((audio_stream_type_t) stream, &state, inPastMs);

    return state;

}



static jboolean

android_media_AudioSystem_isSourceActive(JNIEnv *env, jobject thiz, jint source)

{
@@ -270,6 +279,7 @@ static JNINativeMethod gMethods[] = { 
    {"muteMicrophone",      "(Z)I",     (void *)android_media_AudioSystem_muteMicrophone},

    {"isMicrophoneMuted",   "()Z",      (void *)android_media_AudioSystem_isMicrophoneMuted},

    {"isStreamActive",      "(II)Z",    (void *)android_media_AudioSystem_isStreamActive},

    {"isStreamActiveRemotely","(II)Z",  (void *)android_media_AudioSystem_isStreamActiveRemotely},

    {"isSourceActive",      "(I)Z",     (void *)android_media_AudioSystem_isSourceActive},

    {"setDeviceConnectionState", "(IILjava/lang/String;)I", (void *)android_media_AudioSystem_setDeviceConnectionState},

    {"getDeviceConnectionState", "(ILjava/lang/String;)I",  (void *)android_media_AudioSystem_getDeviceConnectionState},

media/java/android/media/AudioManager.java

+10 −0
Original line number Diff line number Diff line
@@ -1524,6 +1524,16 @@ public class AudioManager { 
        return AudioSystem.isStreamActive(STREAM_MUSIC, 0);

    }



    /**

     * @hide

     * Checks whether any music or media is actively playing on a remote device (e.g. wireless

     *   display). Note that BT audio sinks are not considered remote devices.

     * @return true if {@link AudioManager#STREAM_MUSIC} is active on a remote device

     */

    public boolean isMusicActiveRemotely() {

        return AudioSystem.isStreamActiveRemotely(STREAM_MUSIC, 0);

    }



    /**

     * @hide

     * Checks whether speech recognition is active

media/java/android/media/AudioSystem.java

+8 −0
Original line number Diff line number Diff line
@@ -110,6 +110,14 @@ public class AudioSystem 
     */

    public static native boolean isStreamActive(int stream, int inPastMs);



    /*

     * Checks whether the specified stream type is active on a remotely connected device. The notion

     * of what constitutes a remote device is enforced by the audio policy manager of the platform.

     *

     * return true if any track playing on this stream is active on a remote device.

     */

    public static native boolean isStreamActiveRemotely(int stream, int inPastMs);



    /*

     * Checks whether the specified audio source is active.

     *