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

Commit ed990c70 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "C2 VTS: Set "default" store as preferred store" into rvc-dev am: 9c4bc394 

Change-Id: Ib559d6aa18473fdcb4a7387aae69317e5835b3ef
parents 52572ac4 9c4bc394

media/codec2/hidl/1.0/vts/functional/audio/VtsHalMediaC2V1_0TargetAudioDecTest.cpp

+2 −1
Original line number Diff line number Diff line
@@ -71,7 +71,8 @@ class Codec2AudioDecHidlTest : public ::testing::VtsHalHidlTargetTestBase { 
        mDisableTest = false;

        ALOGV("Codec2AudioDecHidlTest SetUp");

        mClient = android::Codec2Client::CreateFromService(

            gEnv->getInstance().c_str());

            gEnv->getInstance().c_str(),

            !bool(android::Codec2Client::CreateFromService("default", true)));

        ASSERT_NE(mClient, nullptr);

        mListener.reset(new CodecListener(

            [this](std::list<std::unique_ptr<C2Work>>& workItems) {

media/codec2/hidl/1.0/vts/functional/audio/VtsHalMediaC2V1_0TargetAudioEncTest.cpp

+2 −1
Original line number Diff line number Diff line
@@ -65,7 +65,8 @@ class Codec2AudioEncHidlTest : public ::testing::VtsHalHidlTargetTestBase { 
        mDisableTest = false;

        ALOGV("Codec2AudioEncHidlTest SetUp");

        mClient = android::Codec2Client::CreateFromService(

            gEnv->getInstance().c_str());

            gEnv->getInstance().c_str(),

            !bool(android::Codec2Client::CreateFromService("default", true)));

        ASSERT_NE(mClient, nullptr);

        mListener.reset(new CodecListener(

            [this](std::list<std::unique_ptr<C2Work>>& workItems) {

media/codec2/hidl/1.0/vts/functional/video/VtsHalMediaC2V1_0TargetVideoDecTest.cpp

+2 −1
Original line number Diff line number Diff line
@@ -78,7 +78,8 @@ class Codec2VideoDecHidlTest : public ::testing::VtsHalHidlTargetTestBase { 
        mDisableTest = false;

        ALOGV("Codec2VideoDecHidlTest SetUp");

        mClient = android::Codec2Client::CreateFromService(

            gEnv->getInstance().c_str());

            gEnv->getInstance().c_str(),

            !bool(android::Codec2Client::CreateFromService("default", true)));

        ASSERT_NE(mClient, nullptr);

        mListener.reset(new CodecListener(

            [this](std::list<std::unique_ptr<C2Work>>& workItems) {

media/codec2/hidl/1.0/vts/functional/video/VtsHalMediaC2V1_0TargetVideoEncTest.cpp

+2 −1
Original line number Diff line number Diff line
@@ -64,7 +64,8 @@ class Codec2VideoEncHidlTest : public ::testing::VtsHalHidlTargetTestBase { 
        mDisableTest = false;

        ALOGV("Codec2VideoEncHidlTest SetUp");

        mClient = android::Codec2Client::CreateFromService(

            gEnv->getInstance().c_str());

            gEnv->getInstance().c_str(),

            !bool(android::Codec2Client::CreateFromService("default", true)));

        ASSERT_NE(mClient, nullptr);

        mListener.reset(new CodecListener(

            [this](std::list<std::unique_ptr<C2Work>>& workItems) {