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

Commit c070d597 authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

Merge "Add `SystemApi` tag on getLastAudibleStreamVolume" am: f3a2e55f am:... 

Merge "Add `SystemApi` tag on getLastAudibleStreamVolume" am: f3a2e55f am: ee0ad095 am: b8be957a

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1863058

Change-Id: If49dd39c13ee0ef0493b05f750ba666ea78c210d
parents 1453484c b8be957a

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -5260,6 +5260,7 @@ package android.media { 
    method @NonNull @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public static java.util.List<android.media.audiopolicy.AudioVolumeGroup> getAudioVolumeGroups();

    method @RequiresPermission(anyOf={android.Manifest.permission.MODIFY_AUDIO_ROUTING, "android.permission.QUERY_AUDIO_STATE"}) public int getDeviceVolumeBehavior(@NonNull android.media.AudioDeviceAttributes);

    method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.MODIFY_AUDIO_ROUTING, "android.permission.QUERY_AUDIO_STATE"}) public java.util.List<android.media.AudioDeviceAttributes> getDevicesForAttributes(@NonNull android.media.AudioAttributes);

    method @RequiresPermission("android.permission.QUERY_AUDIO_STATE") public int getLastAudibleStreamVolume(int);

    method @IntRange(from=0) public long getMaxAdditionalOutputDeviceDelay(@NonNull android.media.AudioDeviceInfo);

    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);

media/java/android/media/AudioManager.java

+2 −1
Original line number Diff line number Diff line
@@ -1172,7 +1172,8 @@ public class AudioManager { 
     *

     * @hide

     */

    @UnsupportedAppUsage

    @SystemApi

    @RequiresPermission("android.permission.QUERY_AUDIO_STATE")

    public int getLastAudibleStreamVolume(int streamType) {

        final IAudioService service = getService();

        try {

services/core/java/com/android/server/audio/AudioService.java

+8 −0
Original line number Diff line number Diff line
@@ -3233,6 +3233,13 @@ public class AudioService extends IAudioService.Stub 
        }

    }



    private void enforceQueryStatePermission() {

        if (mContext.checkCallingOrSelfPermission(Manifest.permission.QUERY_AUDIO_STATE)

                != PackageManager.PERMISSION_GRANTED) {

            throw new SecurityException("Missing QUERY_AUDIO_STATE permissions");

        }

    }



    private void enforceQueryStateOrModifyRoutingPermission() {

        if (mContext.checkCallingOrSelfPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING)

                != PackageManager.PERMISSION_GRANTED
@@ -4134,6 +4141,7 @@ public class AudioService extends IAudioService.Stub 


    /** Get last audible volume before stream was muted. */

    public int getLastAudibleStreamVolume(int streamType) {

        enforceQueryStatePermission();

        ensureValidStreamType(streamType);

        int device = getDeviceForStream(streamType);

        return (mStreamStates[streamType].getIndex(device) + 5) / 10;