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

Commit 92c84e25 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 7230642 from 1da42f04 to sc-release 

Change-Id: I4a3a0d0e13db358d4004ea6dc48b0e847c5ff169
parents 64dbbf51 1da42f04

PREUPLOAD.cfg

+1 −2
Original line number Diff line number Diff line
@@ -8,8 +8,7 @@ clang_format = --commit ${PREUPLOAD_COMMIT} --style file --extensions c,h,cc,cpp 
               include/input/

               include/powermanager/

               libs/binder/fuzzer/

               libs/binder/ndk/

               libs/binder/tests/fuzzers/

               libs/binder/

               libs/binderthreadstate/

               libs/graphicsenv/

               libs/gui/

cmds/dumpstate/DumpPool.cpp

+1 −1
Original line number Diff line number Diff line
@@ -64,8 +64,8 @@ void DumpPool::shutdown() { 
    if (shutdown_ || threads_.empty()) {

        return;

    }

    while (!tasks_.empty()) tasks_.pop();

    futures_map_.clear();

    while (!tasks_.empty()) tasks_.pop();



    shutdown_ = true;

    condition_variable_.notify_all();

cmds/dumpstate/tests/dumpstate_test.cpp

+21 −0
Original line number Diff line number Diff line
@@ -1762,6 +1762,27 @@ TEST_F(DumpPoolTest, EnqueueTask_withDurationLog) { 
    EXPECT_THAT(getTempFileCounts(kTestDataPath), Eq(0));

}



TEST_F(DumpPoolTest, Shutdown_withoutCrash) {

    bool run_1 = false;

    auto dump_func_1 = [&]() {

        run_1 = true;

    };

    auto dump_func = []() {

        sleep(1);

    };



    dump_pool_->start(/* thread_counts = */1);

    dump_pool_->enqueueTask(/* task_name = */"1", dump_func_1);

    dump_pool_->enqueueTask(/* task_name = */"2", dump_func);

    dump_pool_->enqueueTask(/* task_name = */"3", dump_func);

    dump_pool_->enqueueTask(/* task_name = */"4", dump_func);

    dump_pool_->waitForTask("1", "", out_fd_.get());

    dump_pool_->shutdown();



    EXPECT_TRUE(run_1);

    EXPECT_THAT(getTempFileCounts(kTestDataPath), Eq(0));

}



class TaskQueueTest : public DumpstateBaseTest {

public:

    void SetUp() {

headers/media_plugin/media/openmax/OMX_Core.h

+6 −0
Original line number Diff line number Diff line
@@ -556,6 +556,12 @@ typedef enum OMX_EVENTTYPE 
     */

    OMX_EventConfigUpdate,



    /**

     * Event fired by a tunneled decoder when the first frame is decoded and

     * ready to be rendered.

     */

    OMX_EventOnFirstTunnelFrameReady,



    OMX_EventMax = 0x7FFFFFFF

} OMX_EVENTTYPE;

headers/media_plugin/media/openmax/OMX_IndexExt.h

+1 −0
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ typedef enum OMX_INDEXEXTTYPE { 
    OMX_IndexParamConsumerUsageBits,                /**< reference: OMX_PARAM_U32TYPE */

    OMX_IndexConfigLatency,                         /**< reference: OMX_PARAM_U32TYPE */

    OMX_IndexConfigLowLatency,                      /**< reference: OMX_CONFIG_BOOLEANTYPE */

    OMX_IndexConfigAndroidTunnelPeek,               /**< reference: OMX_CONFIG_BOOLEANTYPE */

    OMX_IndexExtOtherEndUnused,



    /* Time configurations */