commit | e1804d51ece336f5d6109e5fb677cff266ebeafa | [log] [tgz] |
---|---|---|
author | Wonsik Kim <wonsik@google.com> | Wed Mar 06 19:39:41 2024 +0000 |
committer | Cherrypicker Worker <android-build-cherrypicker-worker@google.com> | Tue Mar 19 17:38:09 2024 +0000 |
tree | f382e40c735b871dc9b2822024271428b82e43ff | |
parent | 5ad6f92f152f63a670857423b65f9d5080a8ee5d [diff] |
VTS: check ro.vendor.api_level instead of ro.board.(first_)api_level Bug: 327526153 Test: atest VtsHalMediaC2V1_0TargetMasterTest (cherry picked from https://android-review.googlesource.com/q/commit:04c8943004913bb606d959b7f796477016a3b1e0) Merged-In: I130134b791bf9b3ebe1a9687c921dbbd5295e143 Change-Id: I130134b791bf9b3ebe1a9687c921dbbd5295e143
diff --git a/media/codec2/hal/hidl/1.0/vts/functional/master/VtsHalMediaC2V1_0TargetMasterTest.cpp b/media/codec2/hal/hidl/1.0/vts/functional/master/VtsHalMediaC2V1_0TargetMasterTest.cpp index a34cef1..d1f0fb5 100644 --- a/media/codec2/hal/hidl/1.0/vts/functional/master/VtsHalMediaC2V1_0TargetMasterTest.cpp +++ b/media/codec2/hal/hidl/1.0/vts/functional/master/VtsHalMediaC2V1_0TargetMasterTest.cpp
@@ -84,14 +84,11 @@ } TEST_P(Codec2MasterHalTest, MustUseAidlBeyond202404) { - static int sBoardFirstApiLevel = android::base::GetIntProperty("ro.board.first_api_level", 0); - static int sBoardApiLevel = android::base::GetIntProperty("ro.board.api_level", 0); - if (sBoardFirstApiLevel < 202404 && sBoardApiLevel < 202404) { - GTEST_SKIP() << "board first level less than 202404:" - << " ro.board.first_api_level = " << sBoardFirstApiLevel - << " ro.board.api_level = " << sBoardApiLevel; + static int sVendorApiLevel = android::base::GetIntProperty("ro.vendor.api_level", 0); + if (sVendorApiLevel < 202404) { + GTEST_SKIP() << "vendor api level less than 202404: " << sVendorApiLevel; } - ALOGV("HidlCodecAllowed Test"); + ALOGV("MustUseAidlBeyond202404 Test"); EXPECT_NE(mClient->getAidlBase(), nullptr) << "android.hardware.media.c2 MUST use AIDL " << "for chipsets launching at 202404 or above";