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

Commit ad09eb6e authored by Oscar Azucena's avatar Oscar Azucena
Browse files

Add permission to volume callback APIs 

The permission was missing but it is required since the un/register APIs
are system APIs.

Bug: 402502314
Flag: android.media.audio.register_volume_callback_api_hardening
Test: atest AudioManagerTest
Change-Id: I1727b50d56c873c2873a8f1adf4e5184e9cc3489
parent 76e3bf9a

core/api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -7435,7 +7435,7 @@ package android.media { 
    method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public void muteAwaitConnection(@NonNull int[], @NonNull android.media.AudioDeviceAttributes, long, @NonNull java.util.concurrent.TimeUnit) throws java.lang.IllegalStateException;

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

    method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public void registerMuteAwaitConnectionCallback(@NonNull java.util.concurrent.Executor, @NonNull android.media.AudioManager.MuteAwaitConnectionCallback);

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

    method @FlaggedApi("android.media.audio.register_volume_callback_api_hardening") @RequiresPermission("Manifest.permission.MODIFY_AUDIO_SETTINGS_PRIVILEGED") public void registerVolumeGroupCallback(@NonNull java.util.concurrent.Executor, @NonNull android.media.AudioManager.VolumeGroupCallback);

    method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public void removeAssistantServicesUids(@NonNull int[]);

    method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public boolean removeDeviceAsNonDefaultForStrategy(@NonNull android.media.audiopolicy.AudioProductStrategy, @NonNull android.media.AudioDeviceAttributes);

    method @RequiresPermission(anyOf={android.Manifest.permission.MODIFY_AUDIO_ROUTING, "android.permission.QUERY_AUDIO_STATE"}) public void removeOnDevicesForAttributesChangedListener(@NonNull android.media.AudioManager.OnDevicesForAttributesChangedListener);
@@ -7466,7 +7466,7 @@ package android.media { 
    method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public void unregisterAudioPolicy(@NonNull android.media.audiopolicy.AudioPolicy);

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

    method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public void unregisterMuteAwaitConnectionCallback(@NonNull android.media.AudioManager.MuteAwaitConnectionCallback);

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

    method @FlaggedApi("android.media.audio.register_volume_callback_api_hardening") @RequiresPermission("Manifest.permission.MODIFY_AUDIO_SETTINGS_PRIVILEGED") public void unregisterVolumeGroupCallback(@NonNull android.media.AudioManager.VolumeGroupCallback);

    field public static final String ACTION_VOLUME_CHANGED = "android.media.VOLUME_CHANGED_ACTION";

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

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

media/java/android/media/AudioManager.java

+14 −6
Original line number Diff line number Diff line
@@ -19,14 +19,15 @@ package android.media; 
import static android.companion.virtual.VirtualDeviceParams.DEVICE_POLICY_DEFAULT;

import static android.companion.virtual.VirtualDeviceParams.POLICY_TYPE_AUDIO;

import static android.content.Context.DEVICE_ID_DEFAULT;

import static android.media.audio.Flags.FLAG_UNIFY_ABSOLUTE_VOLUME_MANAGEMENT;

import static android.media.audio.Flags.autoPublicVolumeApiHardening;

import static android.media.audio.Flags.cacheGetStreamMinMaxVolume;

import static android.media.audio.Flags.cacheGetStreamVolume;

import static android.media.audio.Flags.FLAG_DEPRECATE_STREAM_BT_SCO;

import static android.media.audio.Flags.FLAG_FOCUS_EXCLUSIVE_WITH_RECORDING;

import static android.media.audio.Flags.FLAG_FOCUS_FREEZE_TEST_API;

import static android.media.audio.Flags.FLAG_REGISTER_VOLUME_CALLBACK_API_HARDENING;

import static android.media.audio.Flags.FLAG_SUPPORTED_DEVICE_TYPES_API;

import static android.media.audio.Flags.FLAG_UNIFY_ABSOLUTE_VOLUME_MANAGEMENT;

import static android.media.audio.Flags.autoPublicVolumeApiHardening;

import static android.media.audio.Flags.cacheGetStreamMinMaxVolume;

import static android.media.audio.Flags.cacheGetStreamVolume;

import static android.media.audiopolicy.Flags.FLAG_ENABLE_FADE_MANAGER_CONFIGURATION;



import android.Manifest;
@@ -8777,14 +8778,17 @@ public class AudioManager { 
    }



    /**

     * @hide

     * Register an audio volume group change listener.

     *

     * @param executor {@link Executor} to handle the callbacks

     * @param callback the callback to receive the audio volume group changes

     * @throws SecurityException if the caller doesn't have the required permission.

     *

     * @hide

     */

    @SystemApi

    @FlaggedApi(FLAG_REGISTER_VOLUME_CALLBACK_API_HARDENING)

    @RequiresPermission("Manifest.permission.MODIFY_AUDIO_SETTINGS_PRIVILEGED")

    public void registerVolumeGroupCallback(@NonNull Executor executor,

            @NonNull VolumeGroupCallback callback) {

        mVolumeChangedListenerMgr.addListener(executor, callback, "registerVolumeGroupCallback",
@@ -8792,11 +8796,15 @@ public class AudioManager { 
    }



    /**

     * @hide

     * Unregister an audio volume group change listener.

     *

     * @param callback the {@link VolumeGroupCallback} to unregister

     *

     * @hide

     */

    @SystemApi

    @FlaggedApi(FLAG_REGISTER_VOLUME_CALLBACK_API_HARDENING)

    @RequiresPermission("Manifest.permission.MODIFY_AUDIO_SETTINGS_PRIVILEGED")

    public void unregisterVolumeGroupCallback(@NonNull VolumeGroupCallback callback) {

        mVolumeChangedListenerMgr.removeListener(callback, "unregisterVolumeGroupCallback");

    }