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

Commit 1cd36ecb authored by Hongwei Wang's avatar Hongwei Wang Committed by Android (Google) Code Review
Browse files

Merge changes from topic "renault-volume-group" 

* changes:
  Add Volume per Attributes setter/getters
  Add Volume Groups API to AudioManager
  AudioVolumeGroup introspection & callback JAVA APIs
parents 73dec61c ebb67d0e

api/system-current.txt

+35 −0
Original line number Diff line number Diff line
@@ -3456,15 +3456,22 @@ package android.media { 
    method public void clearAudioServerStateCallback();

    method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public int dispatchAudioFocusChange(@NonNull android.media.AudioFocusInfo, int, @NonNull android.media.audiopolicy.AudioPolicy);

    method @NonNull @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public android.media.audiopolicy.AudioProductStrategies getAudioProductStrategies();

    method @NonNull @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public android.media.audiopolicy.AudioVolumeGroups getAudioVolumeGroups();

    method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public int getMaxVolumeIndexForAttributes(@NonNull android.media.AudioAttributes);

    method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public int getMinVolumeIndexForAttributes(@NonNull android.media.AudioAttributes);

    method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public int getVolumeIndexForAttributes(@NonNull android.media.AudioAttributes);

    method public boolean isAudioServerRunning();

    method public boolean isHdmiSystemAudioSupported();

    method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public int registerAudioPolicy(@NonNull android.media.audiopolicy.AudioPolicy);

    method public void registerVolumeGroupCallback(@NonNull java.util.concurrent.Executor, @NonNull android.media.AudioManager.VolumeGroupCallback);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public int requestAudioFocus(android.media.AudioManager.OnAudioFocusChangeListener, @NonNull android.media.AudioAttributes, int, int) throws java.lang.IllegalArgumentException;

    method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.MODIFY_PHONE_STATE, android.Manifest.permission.MODIFY_AUDIO_ROUTING}) public int requestAudioFocus(android.media.AudioManager.OnAudioFocusChangeListener, @NonNull android.media.AudioAttributes, int, int, android.media.audiopolicy.AudioPolicy) throws java.lang.IllegalArgumentException;

    method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public int requestAudioFocus(@NonNull android.media.AudioFocusRequest, @Nullable android.media.audiopolicy.AudioPolicy);

    method public void setAudioServerStateCallback(@NonNull java.util.concurrent.Executor, @NonNull android.media.AudioManager.AudioServerStateCallback);

    method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public void setFocusRequestResult(@NonNull android.media.AudioFocusInfo, int, @NonNull android.media.audiopolicy.AudioPolicy);

    method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public void setVolumeIndexForAttributes(@NonNull android.media.AudioAttributes, int, int);

    method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public void unregisterAudioPolicyAsync(@NonNull android.media.audiopolicy.AudioPolicy);

    method public void unregisterVolumeGroupCallback(@NonNull android.media.AudioManager.VolumeGroupCallback);

    field public static final int AUDIOFOCUS_FLAG_DELAY_OK = 1; // 0x1

    field public static final int AUDIOFOCUS_FLAG_LOCK = 4; // 0x4

    field public static final int AUDIOFOCUS_FLAG_PAUSES_ON_DUCKABLE_LOSS = 2; // 0x2
@@ -3478,6 +3485,11 @@ package android.media { 
    method public void onAudioServerUp();

  }













  public abstract static class AudioManager.VolumeGroupCallback {













    ctor public AudioManager.VolumeGroupCallback();













    method public void onAudioVolumeGroupChanged(int, int);













  }



























  public final class AudioPlaybackConfiguration implements android.os.Parcelable {















    method public int getClientPid();















    method public int getClientUid();










@@ -3649,6 +3661,8 @@ package android.media.audiopolicy {













    method @Nullable public android.media.audiopolicy.AudioProductStrategy getById(int);















    method public int getLegacyStreamTypeForAudioAttributes(@NonNull android.media.AudioAttributes);















    method @Nullable public android.media.audiopolicy.AudioProductStrategy getProductStrategyForAudioAttributes(@NonNull android.media.AudioAttributes);













    method public int getVolumeGroupIdForAttributes(@NonNull android.media.AudioAttributes);













    method public int getVolumeGroupIdForLegacyStreamType(int);















    method public java.util.Iterator<android.media.audiopolicy.AudioProductStrategy> iterator();















    method public int size();















    method public void writeToParcel(@NonNull android.os.Parcel, int);









@@ -3664,6 +3678,27 @@ package android.media.audiopolicy {













    field public static final android.os.Parcelable.Creator<android.media.audiopolicy.AudioProductStrategy> CREATOR;















  }



























  public final class AudioVolumeGroup implements android.os.Parcelable {













    method public int describeContents();













    method public java.util.List<android.media.AudioAttributes> getAudioAttributes();













    method public int getId();













    method @NonNull public int[] getLegacyStreamTypes();













    method @NonNull public String name();













    method public void writeToParcel(@NonNull android.os.Parcel, int);













    field public static final android.os.Parcelable.Creator<android.media.audiopolicy.AudioVolumeGroup> CREATOR;













  }

























  public final class AudioVolumeGroups implements java.lang.Iterable<android.media.audiopolicy.AudioVolumeGroup> android.os.Parcelable {













    ctor public AudioVolumeGroups();













    method public int describeContents();













    method @Nullable public android.media.audiopolicy.AudioVolumeGroup getById(int);













    method public java.util.Iterator<android.media.audiopolicy.AudioVolumeGroup> iterator();













    method public int size();













    method public void writeToParcel(@NonNull android.os.Parcel, int);













    field public static final android.os.Parcelable.Creator<android.media.audiopolicy.AudioVolumeGroups> CREATOR;













    field public static final int DEFAULT_VOLUME_GROUP = -1; // 0xffffffff













  }



























}





























package android.media.session {

































core/jni/Android.bp



+2
−0




























Original line number
Diff line number
Diff line








@@ -165,6 +165,8 @@ cc_library_shared {













        "android_media_AudioTrack.cpp",















        "android_media_AudioAttributes.cpp",















        "android_media_AudioProductStrategies.cpp",













        "android_media_AudioVolumeGroups.cpp",













        "android_media_AudioVolumeGroupCallback.cpp",















        "android_media_DeviceCallback.cpp",















        "android_media_JetPlayer.cpp",















        "android_media_MediaMetricsJNI.cpp",

































core/jni/AndroidRuntime.cpp



+4
−0




























Original line number
Diff line number
Diff line








@@ -110,6 +110,8 @@ extern int register_android_media_AudioSystem(JNIEnv *env);













extern int register_android_media_AudioTrack(JNIEnv *env);















extern int register_android_media_AudioAttributes(JNIEnv *env);















extern int register_android_media_AudioProductStrategies(JNIEnv *env);













extern int register_android_media_AudioVolumeGroups(JNIEnv *env);













extern int register_android_media_AudioVolumeGroupChangeHandler(JNIEnv *env);















extern int register_android_media_MicrophoneInfo(JNIEnv *env);















extern int register_android_media_JetPlayer(JNIEnv *env);















extern int register_android_media_ToneGenerator(JNIEnv *env);










@@ -1524,6 +1526,8 @@ static const RegJNIRec gRegJNI[] = {













    REG_JNI(register_android_media_AudioTrack),















    REG_JNI(register_android_media_AudioAttributes),















    REG_JNI(register_android_media_AudioProductStrategies),













    REG_JNI(register_android_media_AudioVolumeGroups),













    REG_JNI(register_android_media_AudioVolumeGroupChangeHandler),















    REG_JNI(register_android_media_JetPlayer),















    REG_JNI(register_android_media_MicrophoneInfo),















    REG_JNI(register_android_media_RemoteDisplay),

































core/jni/android_media_AudioProductStrategies.cpp



+4
−4




























Original line number
Diff line number
Diff line








@@ -57,7 +57,7 @@ static struct {













static jclass gAudioAttributesGroupClass;















static jmethodID gAudioAttributesGroupCstor;















static struct {













    jfieldID    mGroupId;













    jfieldID    mVolumeGroupId;















    jfieldID    mLegacyStreamType;















    jfieldID    mAudioAttributes;















} gAudioAttributesGroupsFields;










@@ -249,8 +249,8 @@ int register_android_media_AudioProductStrategies(JNIEnv *env)













    gAudioAttributesGroupClass = MakeGlobalRefOrDie(env, audioAttributesGroupClass);















    gAudioAttributesGroupCstor = GetMethodIDOrDie(env, audioAttributesGroupClass, "<init>",















                                                  "(II[Landroid/media/AudioAttributes;)V");













    gAudioAttributesGroupsFields.mGroupId = GetFieldIDOrDie(













                env, audioAttributesGroupClass, "mGroupId", "I");













    gAudioAttributesGroupsFields.mVolumeGroupId = GetFieldIDOrDie(













                env, audioAttributesGroupClass, "mVolumeGroupId", "I");















    gAudioAttributesGroupsFields.mLegacyStreamType = GetFieldIDOrDie(















                env, audioAttributesGroupClass, "mLegacyStreamType", "I");















    gAudioAttributesGroupsFields.mAudioAttributes = GetFieldIDOrDie(

































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},