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

Commit 3f3d3251 authored by Eric Laurent's avatar Eric Laurent Committed by Android (Google) Code Review
Browse files

Merge "Refactor audio aconfig flags" into main

parents f475ad8c 51199378

AconfigFlags.bp

+1 −9
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ aconfig_srcjars = [ 
    ":android.service.notification.flags-aconfig-java{.generated_srcjars}",

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

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

    ":audio-framework-aconfig",

    ":camera_platform_flags_core_java_lib{.generated_srcjars}",

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

    ":android.hardware.biometrics.flags-aconfig-java{.generated_srcjars}",
@@ -39,7 +40,6 @@ 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}",
@@ -54,7 +54,6 @@ aconfig_srcjars = [ 
    ":android.view.contentprotection.flags-aconfig-java{.generated_srcjars}",

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

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

    ":aconfig_midi_flags_java_lib{.generated_srcjars}",

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

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

    ":device_policy_aconfig_flags_lib{.generated_srcjars}",
@@ -393,13 +392,6 @@ 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/current.txt

+8 −8
Original line number Diff line number Diff line
@@ -25866,15 +25866,15 @@ package android.media.midi { 
    method public abstract void onDisconnect(android.media.midi.MidiReceiver);

  }













  @FlaggedApi("com.android.media.midi.flags.virtual_ump") public abstract class MidiUmpDeviceService extends android.app.Service {













  @FlaggedApi("android.media.midi.virtual_ump") public abstract class MidiUmpDeviceService extends android.app.Service {















    ctor public MidiUmpDeviceService();













    method @FlaggedApi("com.android.media.midi.flags.virtual_ump") @Nullable public final android.media.midi.MidiDeviceInfo getDeviceInfo();













    method @FlaggedApi("com.android.media.midi.flags.virtual_ump") @NonNull public final java.util.List<android.media.midi.MidiReceiver> getOutputPortReceivers();













    method @FlaggedApi("com.android.media.midi.flags.virtual_ump") @Nullable public android.os.IBinder onBind(@NonNull android.content.Intent);













    method @FlaggedApi("com.android.media.midi.flags.virtual_ump") public void onClose();













    method @FlaggedApi("com.android.media.midi.flags.virtual_ump") public void onDeviceStatusChanged(@NonNull android.media.midi.MidiDeviceStatus);













    method @FlaggedApi("com.android.media.midi.flags.virtual_ump") @NonNull public abstract java.util.List<android.media.midi.MidiReceiver> onGetInputPortReceivers();













    field @FlaggedApi("com.android.media.midi.flags.virtual_ump") public static final String SERVICE_INTERFACE = "android.media.midi.MidiUmpDeviceService";













    method @FlaggedApi("android.media.midi.virtual_ump") @Nullable public final android.media.midi.MidiDeviceInfo getDeviceInfo();













    method @FlaggedApi("android.media.midi.virtual_ump") @NonNull public final java.util.List<android.media.midi.MidiReceiver> getOutputPortReceivers();













    method @FlaggedApi("android.media.midi.virtual_ump") @Nullable public android.os.IBinder onBind(@NonNull android.content.Intent);













    method @FlaggedApi("android.media.midi.virtual_ump") public void onClose();













    method @FlaggedApi("android.media.midi.virtual_ump") public void onDeviceStatusChanged(@NonNull android.media.midi.MidiDeviceStatus);













    method @FlaggedApi("android.media.midi.virtual_ump") @NonNull public abstract java.util.List<android.media.midi.MidiReceiver> onGetInputPortReceivers();













    field @FlaggedApi("android.media.midi.virtual_ump") public static final String SERVICE_INTERFACE = "android.media.midi.MidiUmpDeviceService";















  }





























}

























core/api/system-current.txt



+1
−1




























Original line number
Diff line number
Diff line








@@ -6751,7 +6751,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("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>>);













    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>>);















    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

























core/api/test-current.txt



+5
−5




























Original line number
Diff line number
Diff line








@@ -1801,8 +1801,8 @@ package android.media {





























  public class AudioManager {















    method @RequiresPermission("android.permission.QUERY_AUDIO_STATE") public int abandonAudioFocusForTest(@NonNull android.media.AudioFocusRequest, @NonNull String);













    method @FlaggedApi("com.android.media.audio.flags.focus_freeze_test_api") @RequiresPermission("Manifest.permission.MODIFY_AUDIO_SETTINGS_PRIVILEGED") public boolean enterAudioFocusFreezeForTest(@NonNull java.util.List<java.lang.Integer>);













    method @FlaggedApi("com.android.media.audio.flags.focus_freeze_test_api") @RequiresPermission("Manifest.permission.MODIFY_AUDIO_SETTINGS_PRIVILEGED") public boolean exitAudioFocusFreezeForTest();













    method @FlaggedApi("android.media.audio.focus_freeze_test_api") @RequiresPermission("Manifest.permission.MODIFY_AUDIO_SETTINGS_PRIVILEGED") public boolean enterAudioFocusFreezeForTest(@NonNull java.util.List<java.lang.Integer>);













    method @FlaggedApi("android.media.audio.focus_freeze_test_api") @RequiresPermission("Manifest.permission.MODIFY_AUDIO_SETTINGS_PRIVILEGED") public boolean exitAudioFocusFreezeForTest();















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















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















    method @NonNull @RequiresPermission(android.Manifest.permission.CALL_AUDIO_INTERCEPTION) public android.media.AudioRecord getCallDownlinkExtractionAudioRecord(@NonNull android.media.AudioFormat);









@@ -1810,9 +1810,9 @@ package android.media {













    method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_SETTINGS_PRIVILEGED) public float getCsd();















    method @Nullable public static android.media.AudioDeviceInfo getDeviceInfoFromType(int);















    method @IntRange(from=0) @RequiresPermission("android.permission.QUERY_AUDIO_STATE") public long getFadeOutDurationOnFocusLossMillis(@NonNull android.media.AudioAttributes);













    method @FlaggedApi("com.android.media.audio.flags.focus_freeze_test_api") @NonNull @RequiresPermission("android.permission.QUERY_AUDIO_STATE") public java.util.List<java.lang.Integer> getFocusDuckedUidsForTest();













    method @FlaggedApi("com.android.media.audio.flags.focus_freeze_test_api") @RequiresPermission("android.permission.QUERY_AUDIO_STATE") public long getFocusFadeOutDurationForTest();













    method @FlaggedApi("com.android.media.audio.flags.focus_freeze_test_api") @RequiresPermission("android.permission.QUERY_AUDIO_STATE") public long getFocusUnmuteDelayAfterFadeOutForTest();













    method @FlaggedApi("android.media.audio.focus_freeze_test_api") @NonNull @RequiresPermission("android.permission.QUERY_AUDIO_STATE") public java.util.List<java.lang.Integer> getFocusDuckedUidsForTest();













    method @FlaggedApi("android.media.audio.focus_freeze_test_api") @RequiresPermission("android.permission.QUERY_AUDIO_STATE") public long getFocusFadeOutDurationForTest();













    method @FlaggedApi("android.media.audio.focus_freeze_test_api") @RequiresPermission("android.permission.QUERY_AUDIO_STATE") public long getFocusUnmuteDelayAfterFadeOutForTest();















    method @Nullable public static android.media.AudioHalVersionInfo getHalVersion();















    method public static final int[] getPublicStreamTypes();















    method @NonNull public java.util.List<java.lang.Integer> getReportedSurroundFormats();

































media/java/android/media/AudioManager.java



+3
−2




























Original line number
Diff line number
Diff line








@@ -20,8 +20,8 @@ import static android.companion.virtual.VirtualDeviceParams.DEVICE_POLICY_DEFAUL













import static android.companion.virtual.VirtualDeviceParams.POLICY_TYPE_AUDIO;















import static android.content.Context.DEVICE_ID_DEFAULT;





























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













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













import static android.media.audio.Flags.autoPublicVolumeApiHardening;













import static android.media.audio.Flags.FLAG_FOCUS_FREEZE_TEST_API;































import android.Manifest;















import android.annotation.CallbackExecutor;










@@ -686,6 +686,7 @@ public class AudioManager {













            FLAG_ABSOLUTE_VOLUME,















    })















    @Retention(RetentionPolicy.SOURCE)













    // TODO(308698465) remove due to potential conflict with the new flags class















    public @interface Flags {}































    /**