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

Commit f1e8d173 authored by Ján Sebechlebský's avatar Ján Sebechlebský Committed by Android (Google) Code Review
Browse files

Merge "Flag AudioPolicy.updateMixingRules API" into main

parents b231c619 fa1634e2

AconfigFlags.bp

+8 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ aconfig_srcjars = [ 
    ":android.companion.virtual.flags-aconfig-java{.generated_srcjars}",

    ":android.view.inputmethod.flags-aconfig-java{.generated_srcjars}",

    ":android.widget.flags-aconfig-java{.generated_srcjars}",

    ":com.android.media.audio.flags-aconfig-java{.generated_srcjars}",

    ":com.android.media.flags.bettertogether-aconfig-java{.generated_srcjars}",

    ":sdk_sandbox_flags_lib{.generated_srcjars}",

    ":android.permission.flags-aconfig-java{.generated_srcjars}",
@@ -317,6 +318,13 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// Media Audio

java_aconfig_library {

    name: "com.android.media.audio.flags-aconfig-java",

    aconfig_declarations: "aconfig_audio_flags",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// Permissions

aconfig_declarations {

    name: "android.permission.flags-aconfig",

core/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -6720,7 +6720,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 @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 @FlaggedApi("com.android.media.audio.flags.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>>);

    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

+3 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.media.audiopolicy;



import android.annotation.FlaggedApi;

import android.annotation.IntDef;

import android.annotation.NonNull;

import android.annotation.Nullable;
@@ -48,6 +49,7 @@ import android.util.Pair; 
import android.util.Slog;



import com.android.internal.annotations.GuardedBy;

import com.android.media.audio.flags.Flags;



import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;
@@ -417,6 +419,7 @@ 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) {