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

Commit 27638836 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 12573674 from 1fe46be6 to 25Q1-release 

Change-Id: Id06b0b7dad5d39631192e258466803f6d79fb732
parents 7a3bd17d 1fe46be6

media/audio/aconfig/audio_framework.aconfig

+7 −0
Original line number Diff line number Diff line
@@ -163,6 +163,13 @@ flag { 
    bug: "367816690"

}



flag {

    name: "speaker_cleanup_usage"

    namespace: "media_audio"

    description: "Support new AudioAttributes usage for speaker cleanup"

    bug: "355050846"

}



# TODO remove

flag {

    name: "volume_ringer_api_hardening"

media/libaaudio/fuzzer/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -37,12 +37,16 @@ cc_fuzz { 
    ],

    shared_libs: [

        "com.android.media.aaudio-aconfig-cc",

        "libaconfig_storage_read_api_cc",

        "libaudio_aidl_conversion_common_cpp",

        "libaudioclient_aidl_conversion",

        "libaudiomanager",

        "libaudiopolicy",

        "libbinder",

        "libbinder_ndk",

        "libmediautils",

        "libutils",

        "server_configurable_flags",

    ],

    static_libs: [

        "aaudio-aidl-cpp",

media/libaudioclient/AudioRecord.cpp

+0 −5
Original line number Diff line number Diff line
@@ -1577,11 +1577,6 @@ status_t AudioRecord::restoreRecord_l(const char *from) 
    const int INITIAL_RETRIES = 3;

    int retries = INITIAL_RETRIES;

retry:

    if (retries < INITIAL_RETRIES) {

        // refresh the audio configuration cache in this process to make sure we get new

        // input parameters and new IAudioRecord in createRecord_l()

        AudioSystem::clearAudioConfigCache();

    }

    mFlags = mOrigFlags;



    // if the new IAudioRecord is created, createRecord_l() will modify the

media/libaudioclient/AudioSystem.cpp

+444 −383

File changed.

Preview size limit exceeded, changes collapsed.

media/libaudioclient/AudioTrack.cpp

+0 −8
Original line number Diff line number Diff line
@@ -2875,10 +2875,6 @@ status_t AudioTrack::restoreTrack_l(const char *from, bool forceRestore) 
            __func__, mPortId, isOffloadedOrDirect_l() ? "Offloaded or Direct" : "PCM", from);

    ++mSequence;



    // refresh the audio configuration cache in this process to make sure we get new

    // output parameters and new IAudioFlinger in createTrack_l()

    AudioSystem::clearAudioConfigCache();



    if (!forceRestore &&

        (isOffloadedOrDirect_l() || mDoNotReconnect)) {

        // FIXME re-creation of offloaded and direct tracks is not yet implemented;
@@ -2911,10 +2907,6 @@ status_t AudioTrack::restoreTrack_l(const char *from, bool forceRestore) 
    const int INITIAL_RETRIES = 3;

    int retries = INITIAL_RETRIES;

retry:

    if (retries < INITIAL_RETRIES) {

        // See the comment for clearAudioConfigCache at the start of the function.

        AudioSystem::clearAudioConfigCache();

    }

    mFlags = mOrigFlags;



    // If a new IAudioTrack is successfully created, createTrack_l() will modify the