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

Commit f4cf1860 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "VOL_GROUP_CB_ENFORCMENT" into main 

* changes:
  Add permission to volume callback APIs
  Add MODIFY_AUDIO_SETTINGS_PRIVILEGED permission check to volume callback
  AudioService: move volume callback on AudioService
parents 65b2d14c ad09eb6e

Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -427,6 +427,7 @@ java_defaults { 
        "framework-permission-aidl-java",

        "spatializer-aidl-java",

        "audiopolicy-aidl-java",

        "volumegroupcallback-aidl-java",

        "sounddose-aidl-java",

        "modules-utils-expresslog",

        "perfetto_trace_javastream_protos_jarjar",

boot/boot-image-profile.txt

+0 −1
Original line number Diff line number Diff line
@@ -28829,7 +28829,6 @@ Landroid/media/audiopolicy/AudioProductStrategy$AudioAttributesGroup; 
Landroid/media/audiopolicy/AudioProductStrategy;

Landroid/media/audiopolicy/AudioVolumeGroup$1;

Landroid/media/audiopolicy/AudioVolumeGroup;

Landroid/media/audiopolicy/AudioVolumeGroupChangeHandler;

Landroid/media/audiopolicy/IAudioPolicyCallback$Stub$Proxy;

Landroid/media/audiopolicy/IAudioPolicyCallback$Stub;

Landroid/media/audiopolicy/IAudioPolicyCallback;

boot/preloaded-classes

+0 −1
Original line number Diff line number Diff line
@@ -5509,7 +5509,6 @@ android.media.audiopolicy.AudioProductStrategy$AudioAttributesGroup 
android.media.audiopolicy.AudioProductStrategy

android.media.audiopolicy.AudioVolumeGroup$1

android.media.audiopolicy.AudioVolumeGroup

android.media.audiopolicy.AudioVolumeGroupChangeHandler

android.media.audiopolicy.IAudioPolicyCallback$Stub$Proxy

android.media.audiopolicy.IAudioPolicyCallback$Stub

android.media.audiopolicy.IAudioPolicyCallback

config/preloaded-classes

+0 −1
Original line number Diff line number Diff line
@@ -5514,7 +5514,6 @@ android.media.audiopolicy.AudioProductStrategy$AudioAttributesGroup 
android.media.audiopolicy.AudioProductStrategy

android.media.audiopolicy.AudioVolumeGroup$1

android.media.audiopolicy.AudioVolumeGroup

android.media.audiopolicy.AudioVolumeGroupChangeHandler

android.media.audiopolicy.IAudioPolicyCallback$Stub$Proxy

android.media.audiopolicy.IAudioPolicyCallback$Stub

android.media.audiopolicy.IAudioPolicyCallback

core/api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -7442,7 +7442,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);
@@ -7473,7 +7473,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