Allowing OMX.google* codecs for Devices launching with S

S AOSP did not remove the OMX.google* codecs, so this cannot be
enforced for devices launching with S

bug: 230582620
Change-Id: I25e8f827645db8e83c8c3142f5e76a912fdf7b22
This commit is contained in:
Arun Johnson
2022-06-24 18:17:00 +00:00
parent 987a7e3f30
commit 6973e79b91

View File

@@ -400,9 +400,18 @@ TEST_P(StoreHidlTest, OmxCodecAllowedTest) {
<< " 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__)
std::string codecName = info.mName;
bool isAndroidCodec = (codecName.rfind("OMX.google", 0) != std::string::npos);
if (isAndroidCodec && (getFirstApiLevel() <= __ANDROID_API_S__)) {
// refer b/230582620
// S AOSP build did not remove the OMX.google video codecs
// so it is infeasible to require no OMX.google.* video codecs
// on S launching devices
} 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 ||