Merge cherrypicks of ['android-review.googlesource.com/2991903'] into 24Q2-release.
Change-Id: I2dbaf8e3490e6e13dde889fbf79d37577df22e9e
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";