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

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

Merge changes from topic "remove_ audio_mix_test_api" into main 

* changes:
  audio: remove flag android.media.audiopolicy.audio_policy_update_mixing_rules_api
  audio: remove flag android.media.audiopolicy.audio_mix_test_api
parents b0518e73 7fda33df

core/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -8234,7 +8234,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

core/api/test-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -2077,7 +2077,7 @@ package android.media { 
    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 @FlaggedApi("android.media.audiopolicy.audio_mix_test_api") @NonNull public java.util.List<android.media.audiopolicy.AudioMix> getRegisteredPolicyMixes();

    method @NonNull public java.util.List<android.media.audiopolicy.AudioMix> getRegisteredPolicyMixes();

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

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

    method public int getStreamMinVolumeInt(int);
@@ -2268,7 +2268,7 @@ package android.media.audiofx { 
package android.media.audiopolicy {



  public class AudioPolicy {

    method @FlaggedApi("android.media.audiopolicy.audio_mix_test_api") @NonNull public java.util.List<android.media.audiopolicy.AudioMix> getMixes();

    method @NonNull public java.util.List<android.media.audiopolicy.AudioMix> getMixes();

  }



  public static class AudioPolicy.Builder {

core/jni/android_media_AudioSystem.cpp

+15 −38
Original line number Diff line number Diff line
@@ -2184,10 +2184,6 @@ jobject nativeAudioConfigBaseToJavaAudioFormat(JNIEnv *env, const audio_config_b 


jint nativeAudioConfigToJavaAudioFormat(JNIEnv *env, const audio_config_t *nConfigBase,

                                        jobject *jAudioFormat, bool isInput) {

    if (!audio_flags::audio_mix_test_api()) {

        return AUDIO_JAVA_INVALID_OPERATION;

    }



    if (nConfigBase == nullptr) {

        return AUDIO_JAVA_BAD_VALUE;

    }
@@ -2309,10 +2305,6 @@ static jint convertAudioMixingRuleToNative(JNIEnv *env, const jobject audioMixin 


static jint nativeAudioMixToJavaAudioMixingRule(JNIEnv *env, const AudioMix &nAudioMix,

                                                jobject *jAudioMixingRule) {

    if (!audio_flags::audio_mix_test_api()) {

        return AUDIO_JAVA_INVALID_OPERATION;

    }



    jobject jAudioMixMatchCriterionList = env->NewObject(gArrayListClass, gArrayListMethods.cstor);

    for (const auto &criteria : nAudioMix.mCriteria) {

        jobject jAudioAttributes = NULL;
@@ -2371,9 +2363,6 @@ static jint nativeAudioMixToJavaAudioMixingRule(JNIEnv *env, const AudioMix &nAu 
}



static jint convertAudioMixFromNative(JNIEnv *env, jobject *jAudioMix, const AudioMix &nAudioMix) {

    if (!audio_flags::audio_mix_test_api()) {

        return AUDIO_JAVA_INVALID_OPERATION;

    }

    jobject jAudioMixingRule = NULL;

    int status = nativeAudioMixToJavaAudioMixingRule(env, nAudioMix, &jAudioMixingRule);

    if (status != AUDIO_JAVA_SUCCESS) {
@@ -2478,10 +2467,6 @@ android_media_AudioSystem_registerPolicyMixes(JNIEnv *env, jobject clazz, 


static jint android_media_AudioSystem_getRegisteredPolicyMixes(JNIEnv *env, jobject clazz,

                                                               jobject jMixes) {

    if (!audio_flags::audio_mix_test_api()) {

        return AUDIO_JAVA_INVALID_OPERATION;

    }



    status_t status;

    std::vector<AudioMix> mixes;

    ALOGV("AudioSystem::getRegisteredPolicyMixes");
@@ -3866,12 +3851,10 @@ int register_android_media_AudioSystem(JNIEnv *env) 


    jclass audioMixClass = FindClassOrDie(env, "android/media/audiopolicy/AudioMix");

    gAudioMixClass = MakeGlobalRefOrDie(env, audioMixClass);

    if (audio_flags::audio_mix_test_api()) {

    gAudioMixCstor =

            GetMethodIDOrDie(env, audioMixClass, "<init>",

                             "(Landroid/media/audiopolicy/AudioMixingRule;Landroid/"

                             "media/AudioFormat;IIILjava/lang/String;Landroid/os/IBinder;I)V");

    }

    gAudioMixFields.mRule = GetFieldIDOrDie(env, audioMixClass, "mRule",

                                                "Landroid/media/audiopolicy/AudioMixingRule;");

    gAudioMixFields.mFormat = GetFieldIDOrDie(env, audioMixClass, "mFormat",
@@ -3896,10 +3879,8 @@ int register_android_media_AudioSystem(JNIEnv *env) 


    jclass audioMixingRuleClass = FindClassOrDie(env, "android/media/audiopolicy/AudioMixingRule");

    gAudioMixingRuleClass = MakeGlobalRefOrDie(env, audioMixingRuleClass);

    if (audio_flags::audio_mix_test_api()) {

    gAudioMixingRuleCstor = GetMethodIDOrDie(env, audioMixingRuleClass, "<init>",

                                                 "(ILjava/util/Collection;ZZ)V");

    }

    gAudioMixingRuleFields.mCriteria = GetFieldIDOrDie(env, audioMixingRuleClass, "mCriteria",

                                                       "Ljava/util/ArrayList;");

    gAudioMixingRuleFields.mAllowPrivilegedPlaybackCapture =
@@ -3908,24 +3889,20 @@ int register_android_media_AudioSystem(JNIEnv *env) 
    gAudioMixingRuleFields.mVoiceCommunicationCaptureAllowed =

            GetFieldIDOrDie(env, audioMixingRuleClass, "mVoiceCommunicationCaptureAllowed", "Z");



    if (audio_flags::audio_mix_test_api()) {

    jclass audioAttributesClass = FindClassOrDie(env, "android/media/AudioAttributes");

    gAudioAttributesClass = MakeGlobalRefOrDie(env, audioAttributesClass);

    gAudioAttributesCstor = GetMethodIDOrDie(env, gAudioAttributesClass, "<init>", "()V");

    gAudioAttributesFields.mSource = GetFieldIDOrDie(env, gAudioAttributesClass, "mUsage", "I");

    gAudioAttributesFields.mUsage = GetFieldIDOrDie(env, gAudioAttributesClass, "mSource", "I");

    }



    jclass audioMixMatchCriterionClass =

                FindClassOrDie(env, "android/media/audiopolicy/AudioMixingRule$AudioMixMatchCriterion");

    gAudioMixMatchCriterionClass = MakeGlobalRefOrDie(env,audioMixMatchCriterionClass);

    if (audio_flags::audio_mix_test_api()) {

    gAudioMixMatchCriterionAttrCstor =

            GetMethodIDOrDie(env, gAudioMixMatchCriterionClass, "<init>",

                             "(Landroid/media/AudioAttributes;I)V");

    gAudioMixMatchCriterionIntPropCstor = GetMethodIDOrDie(env, gAudioMixMatchCriterionClass,

                                                           "<init>", "(Ljava/lang/Integer;I)V");

    }

    gAudioMixMatchCriterionFields.mAttr = GetFieldIDOrDie(env, audioMixMatchCriterionClass, "mAttr",

                                                       "Landroid/media/AudioAttributes;");

    gAudioMixMatchCriterionFields.mIntProp = GetFieldIDOrDie(env, audioMixMatchCriterionClass, "mIntProp",

media/java/android/media/AudioManager.java

+0 −5
Original line number Diff line number Diff line
@@ -5770,13 +5770,8 @@ public class AudioManager { 
     * @return All currently registered audio policy mixes.

     */

    @TestApi

    @FlaggedApi(android.media.audiopolicy.Flags.FLAG_AUDIO_MIX_TEST_API)

    @NonNull

    public List<android.media.audiopolicy.AudioMix> getRegisteredPolicyMixes() {

        if (!android.media.audiopolicy.Flags.audioMixTestApi()) {

            return Collections.emptyList();

        }



        final IAudioService service = getService();

        try {

            return service.getRegisteredPolicyMixes();

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

+0 −6
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) {
@@ -627,11 +625,7 @@ public class AudioPolicy { 
     */

    @TestApi

    @NonNull

    @FlaggedApi(Flags.FLAG_AUDIO_MIX_TEST_API)

    public List<AudioMix> getMixes() {

        if (!Flags.audioMixTestApi()) {

            return Collections.emptyList();

        }

        synchronized (mLock) {

            return List.copyOf(mConfig.getMixes());

        }