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
(cherry picked from commit 6973e79b917ff1b7b0febddee69dd245f4222b22)
Merged-In: I25e8f827645db8e83c8c3142f5e76a912fdf7b22
diff --git a/media/omx/1.0/vts/functional/store/VtsHalMediaOmxV1_0TargetStoreTest.cpp b/media/omx/1.0/vts/functional/store/VtsHalMediaOmxV1_0TargetStoreTest.cpp
index 2ae9c2b..00e9837 100755
--- a/media/omx/1.0/vts/functional/store/VtsHalMediaOmxV1_0TargetStoreTest.cpp
+++ b/media/omx/1.0/vts/functional/store/VtsHalMediaOmxV1_0TargetStoreTest.cpp
@@ -400,9 +400,18 @@
<< " 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 ||