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

Commit 4a17a180 authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by android-build-merger
Browse files

Merge "AudioPolicy: more TestApi for ... testing" into qt-dev am: 111ad6a1 

am: f1199ac8

Change-Id: I92a29b6c19f9a7b7ece04af9db3be391e1dbce03
parents 8a78e573 f1199ac8

api/test-current.txt

+3 −0
Original line number Diff line number Diff line
@@ -1104,6 +1104,7 @@ package android.media { 
    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);

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

    field public static final int SUCCESS = 0; // 0x0

  }



  public static final class AudioRecord.MetricsConstants {
@@ -1241,8 +1242,10 @@ package android.media.audiopolicy { 
    method public int detachMixes(@NonNull java.util.List<android.media.audiopolicy.AudioMix>);

    method public int getFocusDuckingBehavior();

    method public int getStatus();

    method public boolean removeUidDeviceAffinity(int);

    method public int setFocusDuckingBehavior(int) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException;

    method public void setRegistration(String);

    method public boolean setUidDeviceAffinity(int, @NonNull java.util.List<android.media.AudioDeviceInfo>);

    method public String toLogFriendlyString();

    field public static final int FOCUS_POLICY_DUCKING_DEFAULT = 0; // 0x0

    field public static final int FOCUS_POLICY_DUCKING_IN_APP = 0; // 0x0

media/java/android/media/AudioManager.java

+1 −0
Original line number Diff line number Diff line
@@ -4523,6 +4523,7 @@ public class AudioManager { 
     */



    /** @hide */

    @TestApi

    @SystemApi

    public static final int SUCCESS = AudioSystem.SUCCESS;

    /**

media/java/android/media/audiopolicy/AudioPolicy.java

+2 −0
Original line number Diff line number Diff line
@@ -416,6 +416,7 @@ public class AudioPolicy { 
     * @param devices list of devices to which the audio stream of the application may be routed.

     * @return true if the change was successful, false otherwise.

     */

    @TestApi

    @SystemApi

    public boolean setUidDeviceAffinity(int uid, @NonNull List<AudioDeviceInfo> devices) {

        if (devices == null) {
@@ -457,6 +458,7 @@ public class AudioPolicy { 
     * @param uid UID of the application affected.

     * @return true if the change was successful, false otherwise.

     */

    @TestApi

    @SystemApi

    public boolean removeUidDeviceAffinity(int uid) {

        synchronized (mLock) {