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

Commit ebb67d0e authored by François Gaffie's avatar François Gaffie Committed by Hongwei Wang
Browse files

Add Volume per Attributes setter/getters 



This patch adds in AudioSystem setter/getter of volume index
and also getter on index min and max according to the given
audio attributes.

Bug: 124767636
Test: dumpsys media.audio_policy
Change-Id: Ia20fcfbf5e20c98de5eb07551c299dc99d678fb8
Signed-off-by: default avatarFrançois Gaffie <francois.gaffie@renault.com>
parent 9c36210d

core/jni/android_media_AudioSystem.cpp

+79 −0
Original line number Diff line number Diff line
@@ -572,6 +572,81 @@ android_media_AudioSystem_getStreamVolumeIndex(JNIEnv *env, 
    return (jint) index;

}



static jint

android_media_AudioSystem_setVolumeIndexForAttributes(JNIEnv *env,

                                                      jobject thiz,

                                                      jobject jaa,

                                                      jint index,

                                                      jint device)

{

    // read the AudioAttributes values

    JNIAudioAttributeHelper::UniqueAaPtr paa = JNIAudioAttributeHelper::makeUnique();

    jint jStatus = JNIAudioAttributeHelper::nativeFromJava(env, jaa, paa.get());

    if (jStatus != (jint)AUDIO_JAVA_SUCCESS) {

        return jStatus;

    }

    return (jint) check_AudioSystem_Command(

            AudioSystem::setVolumeIndexForAttributes(*(paa.get()), index, (audio_devices_t)device));

}



static jint

android_media_AudioSystem_getVolumeIndexForAttributes(JNIEnv *env,

                                                      jobject thiz,

                                                      jobject jaa,

                                                      jint device)

{

    // read the AudioAttributes values

    JNIAudioAttributeHelper::UniqueAaPtr paa = JNIAudioAttributeHelper::makeUnique();

    jint jStatus = JNIAudioAttributeHelper::nativeFromJava(env, jaa, paa.get());

    if (jStatus != (jint)AUDIO_JAVA_SUCCESS) {

        return jStatus;

    }

    int index;

    if (AudioSystem::getVolumeIndexForAttributes(*(paa.get()), index, (audio_devices_t)device)

            != NO_ERROR) {

        index = -1;

    }

    return (jint) index;

}



static jint

android_media_AudioSystem_getMinVolumeIndexForAttributes(JNIEnv *env,

                                                         jobject thiz,

                                                         jobject jaa)

{

    // read the AudioAttributes values

    JNIAudioAttributeHelper::UniqueAaPtr paa = JNIAudioAttributeHelper::makeUnique();

    jint jStatus = JNIAudioAttributeHelper::nativeFromJava(env, jaa, paa.get());

    if (jStatus != (jint)AUDIO_JAVA_SUCCESS) {

        return jStatus;

    }

    int index;

    if (AudioSystem::getMinVolumeIndexForAttributes(*(paa.get()), index)

            != NO_ERROR) {

        index = -1;

    }

    return (jint) index;

}



static jint

android_media_AudioSystem_getMaxVolumeIndexForAttributes(JNIEnv *env,

                                                         jobject thiz,

                                                         jobject jaa)

{

    // read the AudioAttributes values

    JNIAudioAttributeHelper::UniqueAaPtr paa = JNIAudioAttributeHelper::makeUnique();

    jint jStatus = JNIAudioAttributeHelper::nativeFromJava(env, jaa, paa.get());

    if (jStatus != (jint)AUDIO_JAVA_SUCCESS) {

        return jStatus;

    }

    int index;

    if (AudioSystem::getMaxVolumeIndexForAttributes(*(paa.get()), index)

            != NO_ERROR) {

        index = -1;

    }

    return (jint) index;

}



static jint

android_media_AudioSystem_setMasterVolume(JNIEnv *env, jobject thiz, jfloat value)

{
@@ -2172,6 +2247,10 @@ static const JNINativeMethod gMethods[] = { 
    {"initStreamVolume",    "(III)I",   (void *)android_media_AudioSystem_initStreamVolume},

    {"setStreamVolumeIndex","(III)I",   (void *)android_media_AudioSystem_setStreamVolumeIndex},

    {"getStreamVolumeIndex","(II)I",    (void *)android_media_AudioSystem_getStreamVolumeIndex},

    {"setVolumeIndexForAttributes","(Landroid/media/AudioAttributes;II)I",   (void *)android_media_AudioSystem_setVolumeIndexForAttributes},

    {"getVolumeIndexForAttributes","(Landroid/media/AudioAttributes;I)I",    (void *)android_media_AudioSystem_getVolumeIndexForAttributes},

    {"getMinVolumeIndexForAttributes","(Landroid/media/AudioAttributes;)I",    (void *)android_media_AudioSystem_getMinVolumeIndexForAttributes},

    {"getMaxVolumeIndexForAttributes","(Landroid/media/AudioAttributes;)I",    (void *)android_media_AudioSystem_getMaxVolumeIndexForAttributes},

    {"setMasterVolume",     "(F)I",     (void *)android_media_AudioSystem_setMasterVolume},

    {"getMasterVolume",     "()F",      (void *)android_media_AudioSystem_getMasterVolume},

    {"setMasterMute",       "(Z)I",     (void *)android_media_AudioSystem_setMasterMute},

media/java/android/media/AudioSystem.java

+35 −0
Original line number Diff line number Diff line
@@ -920,6 +920,41 @@ public class AudioSystem 
    @UnsupportedAppUsage

    private static native int setStreamVolumeIndex(int stream, int index, int device);

    public static native int getStreamVolumeIndex(int stream, int device);

    /**

     * @hide

     * set a volume for the given {@link AudioAttributes} and for all other stream that belong to

     * the same volume group.

     * @param attributes the {@link AudioAttributes} to be considered

     * @param index to be applied

     * @param device the volume device to be considered

     * @return command completion status.

     */

    public static native int setVolumeIndexForAttributes(@NonNull AudioAttributes attributes,

                                                         int index, int device);

   /**

    * @hide

    * get the volume index for the given {@link AudioAttributes}.

    * @param attributes the {@link AudioAttributes} to be considered

    * @param device the volume device to be considered

    * @return volume index for the given {@link AudioAttributes} and volume device.

    */

    public static native int getVolumeIndexForAttributes(@NonNull AudioAttributes attributes,

                                                         int device);

    /**

     * @hide

     * get the minimum volume index for the given {@link AudioAttributes}.

     * @param attributes the {@link AudioAttributes} to be considered

     * @return minimum volume index for the given {@link AudioAttributes}.

     */

    public static native int getMinVolumeIndexForAttributes(@NonNull AudioAttributes attributes);

    /**

     * @hide

     * get the maximum volume index for the given {@link AudioAttributes}.

     * @param attributes the {@link AudioAttributes} to be considered

     * @return maximum volume index for the given {@link AudioAttributes}.

     */

    public static native int getMaxVolumeIndexForAttributes(@NonNull AudioAttributes attributes);



    public static native int setMasterVolume(float value);

    public static native float getMasterVolume();

    @UnsupportedAppUsage