Merge "Allowing OMX.google* codecs for Devices launching with S" into tm-dev (a2d4aee3) · Commits · e / os / android_hardware_interfaces

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

+10 −1

Original line number	Original line	Diff line number	Diff line
	@@ -399,12 +399,21 @@ TEST_P(StoreHidlTest, OmxCodecAllowedTest) {
	ASSERT_LT(getFirstApiLevel(), __ANDROID_API_T__)		ASSERT_LT(getFirstApiLevel(), __ANDROID_API_T__)
	<< " Component: " << info.mName.c_str() << " Role: " << role.c_str()		<< " Component: " << info.mName.c_str() << " Role: " << role.c_str()
	<< " not allowed for devices launching with Android T and above";		<< " not allowed for devices launching with Android T and above";
			} else {
			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 {		} else {
	ASSERT_LT(getFirstApiLevel(), __ANDROID_API_S__)		ASSERT_LT(getFirstApiLevel(), __ANDROID_API_S__)
	<< " Component: " << info.mName.c_str() << " Role: " << role.c_str()		<< " Component: " << info.mName.c_str() << " Role: " << role.c_str()
	<< " not allowed for devices launching with Android S and above";		<< " not allowed for devices launching with Android S and above";
	}		}
	}		}
			}
	if (role.find("audio_decoder") != std::string::npos \|\|		if (role.find("audio_decoder") != std::string::npos \|\|
	role.find("audio_encoder") != std::string::npos) {		role.find("audio_encoder") != std::string::npos) {
	ASSERT_LT(getFirstApiLevel(), __ANDROID_API_T__)		ASSERT_LT(getFirstApiLevel(), __ANDROID_API_T__)