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

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

Merge "audio: Add test API to wait for AudioHandler" into main

parents e5f6d6b0 364142ff

core/api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -2096,6 +2096,7 @@ package android.media { 
    method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public void setTestDeviceConnectionState(@NonNull android.media.AudioDeviceAttributes, boolean);

    method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_SETTINGS_PRIVILEGED) public void setVolumeControllerLongPressTimeoutEnabled(boolean);

    method @FlaggedApi("android.media.audio.focus_exclusive_with_recording") @RequiresPermission(android.Manifest.permission.QUERY_AUDIO_STATE) public boolean shouldNotificationSoundPlay(@NonNull android.media.AudioAttributes);

    method public void waitForAudioHandlerBarrier();

  }



  public static final class AudioRecord.MetricsConstants {

media/java/android/media/AudioManager.java

+16 −0
Original line number Diff line number Diff line
@@ -10419,6 +10419,22 @@ public class AudioManager { 
        }

    }



    /**

     * @hide

     * Blocks until all messages on the AudioService handler have been processed.

     * Only useful in tests.

     */

    @TestApi

    @SuppressWarnings("UnflaggedApi") // @TestApi without associated feature.

    public void waitForAudioHandlerBarrier() {

        final IAudioService service = getService();

        try {

            service.waitForAudioHandlerBarrier();

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }





    /**

     * @hide

media/java/android/media/IAudioService.aidl

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


    void permissionUpdateBarrier();



    void waitForAudioHandlerBarrier();



    // Java-only methods below.

    void adjustStreamVolume(int streamType, int direction, int flags, String callingPackage);

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

+6 −0
Original line number Diff line number Diff line
@@ -16036,6 +16036,12 @@ public class AudioService extends IAudioService.Stub 
        }

    }













    @Override













    /** @see AudioManager#waitForAudioHandlerBarrier() */













    public void waitForAudioHandlerBarrier() {













        mAudioHandler.runWithScissors(() -> {}, 0);













    }



























    List<String> getDeviceIdentityAddresses(AudioDeviceAttributes device) {















        return mDeviceBroker.getDeviceIdentityAddresses(device);















    }