Merge cherrypicks of [19047366, 19066851] into tm-release. (ad2871f7) · Commits · e / os / android_hardware_interfaces

graphics/composer/aidl/vts/VtsHalGraphicsComposer3_TargetTest.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -1719,10 +1719,10 @@ TEST_P(GraphicsComposerAidlCommandTest, DisplayDecoration) {
		}
		}

		configureLayer(display, layer, Composition::DISPLAY_DECORATION, display.getFrameRect(),
		display.getCrop());
		mWriter.setLayerBuffer(display.getDisplayId(), layer, /slot/ 0, decorBuffer->handle,
		/acquireFence/ -1);
		mWriter.setLayerCompositionType(display.getDisplayId(), layer,
		Composition::DISPLAY_DECORATION);
		mWriter.validateDisplay(display.getDisplayId(), ComposerClientWriter::kNoTimestamp);
		execute();
		if (support) {

+10 −1

Original line number	Diff line number	Diff line
		@@ -399,12 +399,21 @@ TEST_P(StoreHidlTest, OmxCodecAllowedTest) {
		ASSERT_LT(getFirstApiLevel(), __ANDROID_API_T__)
		<< " Component: " << info.mName.c_str() << " Role: " << role.c_str()
		<< " 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 {
		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 \|\|
		role.find("audio_encoder") != std::string::npos) {
		ASSERT_LT(getFirstApiLevel(), __ANDROID_API_T__)