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

Commit 7e46f59a authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by Android (Google) Code Review
Browse files

Merge "AudioManager: test API for dynamic audio policy" into qt-dev

parents 3547b58c 0c88f496

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -1100,6 +1100,7 @@ package android.media { 


  public class AudioManager {

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

    method public boolean hasRegisteredDynamicPolicy();

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

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

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

media/java/android/media/AudioManager.java

+14 −0
Original line number Diff line number Diff line
@@ -3431,6 +3431,20 @@ public class AudioManager { 
        }

    }



    /**

     * @hide

     * @return true if an AudioPolicy was previously registered

     */

    @TestApi

    public boolean hasRegisteredDynamicPolicy() {

        final IAudioService service = getService();

        try {

            return service.hasRegisteredDynamicPolicy();

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    //====================================================================

    // Notification of playback activity & playback configuration

    /**

media/java/android/media/IAudioService.aidl

+2 −0
Original line number Diff line number Diff line
@@ -211,6 +211,8 @@ interface IAudioService { 


    void setVolumePolicy(in VolumePolicy policy);



    boolean hasRegisteredDynamicPolicy();



    void registerRecordingCallback(in IRecordingConfigDispatcher rcdb);



    oneway void unregisterRecordingCallback(in IRecordingConfigDispatcher rcdb);

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

+7 −0
Original line number Diff line number Diff line
@@ -6671,6 +6671,13 @@ public class AudioService extends IAudioService.Stub 
        return AudioManager.SUCCESS;

    }



    /** see AudioManager.hasRegisteredDynamicPolicy */

    public boolean hasRegisteredDynamicPolicy() {

        synchronized (mAudioPolicies) {

            return !mAudioPolicies.isEmpty();

        }

    }



    private final Object mExtVolumeControllerLock = new Object();

    private IAudioPolicyCallback mExtVolumeController;

    private void setExtVolumeController(IAudioPolicyCallback apc) {