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

Commit d72ab13b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "VTS: Remove enforce codec2 on ATV for S devices" am: 842e6219 am:... 

Merge "VTS: Remove enforce codec2 on ATV for S devices" am: 842e6219 am: a5b65bd2 am: abce6a2e

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2054806



Change-Id: I2c0061e94b5b60727a776ba64b653b123daff2f5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b51d11fb abce6a2e

media/omx/1.0/vts/functional/store/VtsHalMediaOmxV1_0TargetStoreTest.cpp

+15 −3
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <android-base/strings.h>

#include <android/api-level.h>



#include <VtsCoreUtil.h>

#include <android/hardware/media/omx/1.0/IOmx.h>

#include <android/hardware/media/omx/1.0/IOmxNode.h>

#include <android/hardware/media/omx/1.0/IOmxObserver.h>
@@ -377,6 +378,10 @@ static int getFirstApiLevel() { 
    return android::base::GetIntProperty("ro.product.first_api_level", __ANDROID_API_T__);

}



static bool isTV() {

    return testing::deviceSupportsFeature("android.software.leanback");

}



// list components and roles.

TEST_P(StoreHidlTest, OmxCodecAllowedTest) {

    hidl_vec<IOmx::ComponentInfo> componentInfos = getComponentInfoList(omx);
@@ -384,10 +389,17 @@ TEST_P(StoreHidlTest, OmxCodecAllowedTest) { 
        for (std::string role : info.mRoles) {

            if (role.find("video_decoder") != std::string::npos ||

                role.find("video_encoder") != std::string::npos) {

                // Codec2 is not mandatory on Android TV devices that launched with Android S

                if (isTV()) {

                    ASSERT_LT(getFirstApiLevel(), __ANDROID_API_T__)

                            << " Component: " << info.mName.c_str() << " Role: " << role.c_str()

                            << " not allowed for devices launching with Android T and above";

                } else {

                    ASSERT_LT(getFirstApiLevel(), __ANDROID_API_S__)

                            << " Component: " << info.mName.c_str() << " Role: " << role.c_str()

                            << " not allowed for devices launching with Android S and above";

                }

            }

            if (role.find("audio_decoder") != std::string::npos ||

                role.find("audio_encoder") != std::string::npos) {

                ASSERT_LT(getFirstApiLevel(), __ANDROID_API_T__)