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

Commit c961c536 authored by Hayden Gomes's avatar Hayden Gomes Committed by android-build-merger
Browse files

Merge "Add IntRange for min and max volume index getters" into qt-dev 

am: 5d211a82

Change-Id: I367248731bd0d33abb0f13761b57d4749cf843ca
parents bb59cf5a 5d211a82

api/system-current.txt

+3 −3
Original line number Diff line number Diff line
@@ -3499,9 +3499,9 @@ package android.media { 
    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 @IntRange(from=0) @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public int getMaxVolumeIndexForAttributes(@NonNull android.media.AudioAttributes);

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

    method @IntRange(from=0) @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);

media/java/android/media/AudioManager.java

+4 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package android.media;



import android.annotation.IntDef;

import android.annotation.IntRange;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.RequiresPermission;
@@ -1204,6 +1205,7 @@ public class AudioManager { 
     * @hide

     */

    @SystemApi

    @IntRange(from = 0)

    @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING)

    public int getVolumeIndexForAttributes(@NonNull AudioAttributes attr) {

        Preconditions.checkNotNull(attr, "attr must not be null");
@@ -1224,6 +1226,7 @@ public class AudioManager { 
     * @hide

     */

    @SystemApi

    @IntRange(from = 0)

    @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING)

    public int getMaxVolumeIndexForAttributes(@NonNull AudioAttributes attr) {

        Preconditions.checkNotNull(attr, "attr must not be null");
@@ -1244,6 +1247,7 @@ public class AudioManager { 
     * @hide

     */

    @SystemApi

    @IntRange(from = 0)

    @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING)

    public int getMinVolumeIndexForAttributes(@NonNull AudioAttributes attr) {

        Preconditions.checkNotNull(attr, "attr must not be null");