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

Commit 7fda33df authored by Eric Laurent's avatar Eric Laurent
Browse files

audio: remove flag android.media.audiopolicy.audio_policy_update_mixing_rules_api 

Test: atest audiopolicy_tests
Bug: 293874525
Flag: EXEMPT flag removal
Change-Id: Ied9b9b54ab2c49673ad0a221e2d46e09de6b3589
parent 12eae9b7

core/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -8232,7 +8232,7 @@ package android.media.audiopolicy { 
    method public boolean setUidDeviceAffinity(int, @NonNull java.util.List<android.media.AudioDeviceInfo>);

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

    method public String toLogFriendlyString();

    method @FlaggedApi("android.media.audiopolicy.audio_policy_update_mixing_rules_api") @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public int updateMixingRules(@NonNull java.util.List<android.util.Pair<android.media.audiopolicy.AudioMix,android.media.audiopolicy.AudioMixingRule>>);

    method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public int updateMixingRules(@NonNull java.util.List<android.util.Pair<android.media.audiopolicy.AudioMix,android.media.audiopolicy.AudioMixingRule>>);

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

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

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

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

+0 −2
Original line number Diff line number Diff line
@@ -59,7 +59,6 @@ import java.lang.annotation.Retention; 
import java.lang.annotation.RetentionPolicy;

import java.lang.ref.WeakReference;

import java.util.ArrayList;

import java.util.Collections;

import java.util.List;

import java.util.Objects;
@@ -447,7 +446,6 @@ public class AudioPolicy { 
     * @return {@link AudioManager#SUCCESS} if the update was successful,

     *  {@link AudioManager#ERROR} otherwise.

     */

    @FlaggedApi(Flags.FLAG_AUDIO_POLICY_UPDATE_MIXING_RULES_API)

    @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING)

    public int updateMixingRules(

            @NonNull List<Pair<AudioMix, AudioMixingRule>> mixingRuleUpdates) {