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

Commit ac9783cd authored by Xin Li's avatar Xin Li
Browse files

Merge Android 12 

Bug: 202323961
Merged-In: I76b505672b7c78b03a9c79df6473212ea5c65072
Change-Id: I262cbcc8dcfb0cad2b8e2f393c95829afe6b3827
parents e1152b63 4e9cab82

audio/7.0/IStreamOut.hal

+0 −2
Original line number Diff line number Diff line
@@ -286,8 +286,6 @@ interface IStreamOut extends IStream { 
     * timestamp must correspond to N rather than N+M. The terms 'recent' and

     * 'small' are not defined. They reflect the quality of the implementation.

     *

     * Optional method

     *

     * @return retval operation completion status.

     * @return frames count of presented audio frames.

     * @return timeStamp associated clock time.

audio/7.0/config/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -276,6 +276,7 @@ package android.audio.policy.configuration.V7_0 { 
    enum_constant public static final android.audio.policy.configuration.V7_0.AudioInOutFlag AUDIO_OUTPUT_FLAG_DIRECT;

    enum_constant public static final android.audio.policy.configuration.V7_0.AudioInOutFlag AUDIO_OUTPUT_FLAG_DIRECT_PCM;

    enum_constant public static final android.audio.policy.configuration.V7_0.AudioInOutFlag AUDIO_OUTPUT_FLAG_FAST;

    enum_constant public static final android.audio.policy.configuration.V7_0.AudioInOutFlag AUDIO_OUTPUT_FLAG_GAPLESS_OFFLOAD;

    enum_constant public static final android.audio.policy.configuration.V7_0.AudioInOutFlag AUDIO_OUTPUT_FLAG_HW_AV_SYNC;

    enum_constant public static final android.audio.policy.configuration.V7_0.AudioInOutFlag AUDIO_OUTPUT_FLAG_IEC958_NONAUDIO;

    enum_constant public static final android.audio.policy.configuration.V7_0.AudioInOutFlag AUDIO_OUTPUT_FLAG_INCALL_MUSIC;

audio/7.0/config/audio_policy_configuration.xsd

+1 −0
Original line number Diff line number Diff line
@@ -177,6 +177,7 @@ 
            <xs:enumeration value="AUDIO_OUTPUT_FLAG_MMAP_NOIRQ" />

            <xs:enumeration value="AUDIO_OUTPUT_FLAG_VOIP_RX" />

            <xs:enumeration value="AUDIO_OUTPUT_FLAG_INCALL_MUSIC" />

            <xs:enumeration value="AUDIO_OUTPUT_FLAG_GAPLESS_OFFLOAD" />

            <xs:enumeration value="AUDIO_INPUT_FLAG_FAST" />

            <xs:enumeration value="AUDIO_INPUT_FLAG_HW_HOTWORD" />

            <xs:enumeration value="AUDIO_INPUT_FLAG_RAW" />

audio/core/all-versions/default/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ cc_defaults { 
        "libaudio_system_headers",

        "libhardware_headers",

        "libmedia_headers",

        "libmediautils_headers",

    ],



    export_header_lib_headers: [

audio/core/all-versions/default/StreamIn.cpp

+3 −3
Original line number Diff line number Diff line
@@ -412,8 +412,8 @@ Return<void> StreamIn::prepareForReading(uint32_t frameSize, uint32_t framesCoun 
    }



    // Create and launch the thread.

    sp<ReadThread> tempReadThread =

            new ReadThread(&mStopReadThread, mStream, tempCommandMQ.get(), tempDataMQ.get(),

    auto tempReadThread =

            sp<ReadThread>::make(&mStopReadThread, mStream, tempCommandMQ.get(), tempDataMQ.get(),

                                 tempStatusMQ.get(), tempElfGroup.get());

    if (!tempReadThread->init()) {

        ALOGW("failed to start reader thread: %s", strerror(-status));