Snap for 5480912 from 3e39fed7a752baaba35274007906fabbc4d3074a to qt-release (a917794d) · Commits · e / os / android_hardware_interfaces

compatibility_matrices/Android.bp

+3 −3

Original line number	Diff line number	Diff line
		@@ -70,8 +70,8 @@ vintf_compatibility_matrix {
		"compatibility_matrix.4.xml",
		],
		kernel_configs: [
		"kernel_config_current_4.9",
		"kernel_config_current_4.14",
		"kernel_config_current_4.19",
		"kernel_config_q_4.9",
		"kernel_config_q_4.14",
		"kernel_config_q_4.19",
		]
		}

current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -487,7 +487,7 @@ b826892686850a9cf2b60ca5845db7185c2196ea4dd765cd80cd163169678a78 android.hardwar
		01c6398c90fc6be0640810e2c5d8a4863b457280132bb3f97dd5682e19632b62 android.hardware.graphics.bufferqueue@2.0::types
		7a2d64095252f85781b2d521f4f11d04ce774544feececcec2088c568656e93c android.hardware.graphics.common@1.2::types
		3dff04a36b86660b5807414587e530bb0c294ed56fdff06f8915ba0a9b73f974 android.hardware.graphics.composer@2.3::IComposer
		54bc1dc874f8bc0781767786075dafd33a0796c1eea7d2317231b8929280e946 android.hardware.graphics.composer@2.3::IComposerClient
		b2b0ef3e6f5e9bb4aa6e978bc62e017b3fd64dba95a2152e8b07e3b7c4581d4f android.hardware.graphics.composer@2.3::IComposerClient
		033e096cb65e5093ee1d0e473892b9a487911d4611dbb65ebecb5cef18338923 android.hardware.graphics.mapper@3.0::IMapper
		7183d9d9acfa41a61a64bdfed548e98299265a7bb1821a3ed204173b5c2cfd4a android.hardware.graphics.mapper@3.0::types
		c3f831a66d5815baf74f5b82fe79cf099542ddae4dfab3f388e1d41828e794fc android.hardware.health.storage@1.0::IGarbageCollectCallback
		@@ -509,7 +509,7 @@ d36f747f9c9a8f2f21db2f8323c2d755dd08b34ce813932d7339979f7d490dab android.hardwar
		b9422a9aca84df1ff9623dc12c0562abce97716e28d63a965f2bfb88f9ad9607 android.hardware.media.c2@1.0::IInputSurface
		0a786a19e6753f9774a7ca7781c2a2edfe5c0b5fa112355dfa0e50ebedeb08b9 android.hardware.media.c2@1.0::IInputSurfaceConnection
		7d3c292ca75ec3e22a8fd4ae72d2edb0659d280257e763786e766f3429954dd1 android.hardware.media.c2@1.0::types
		4880af120fc1640225abdc2c60bda6d79617d73484d5124913c7278af3b11e2d android.hardware.neuralnetworks@1.2::IBurstCallback
		5f6b6b99ffd0d51a5713174a3030a2a69273bcd476fc1b5ce814491437685857 android.hardware.neuralnetworks@1.2::IBurstCallback
		19877e466ad8c6ed42b38050b77bd010cf7800ff365fdc8574f45bbfda03a758 android.hardware.neuralnetworks@1.2::IBurstContext
		b83317b66721241887d2770b5ae95fd5af1e77c5daa7530ecb08fae8892f2b43 android.hardware.neuralnetworks@1.2::IDevice
		92714960d1a53fc2ec557302b41c7cc93d2636d8364a44bd0f85be0c92927ff8 android.hardware.neuralnetworks@1.2::IExecutionCallback

graphics/composer/2.3/IComposerClient.hal

+4 −0

Original line number	Diff line number	Diff line
		@@ -502,6 +502,10 @@ interface IComposerClient extends @2.2::IComposerClient {
		float minLuminance);

		/**
		* Use getDisplayCapabilities instead. If brightness is supported, must return
		* DisplayCapability::BRIGHTNESS as one of the display capabilities via getDisplayCapabilities.
		* Only use getDisplayCapabilities as the source of truth to query brightness support.
		*
		* Gets whether brightness operations are supported on a display.
		*
		* @param display

graphics/composer/2.3/vts/functional/VtsHalGraphicsComposerV2_3TargetTest.cpp

+9 −11

Original line number	Diff line number	Diff line
		@@ -572,6 +572,10 @@ TEST_F(GraphicsComposerHidlTest, getDisplayCapabilitiesBasic) {
		std::find(capabilities.begin(), capabilities.end(),
		IComposerClient::DisplayCapability::DOZE) != capabilities.end();
		EXPECT_EQ(mComposerClient->getDozeSupport(mPrimaryDisplay), hasDozeSupport);
		bool hasBrightnessSupport =
		std::find(capabilities.begin(), capabilities.end(),
		IComposerClient::DisplayCapability::BRIGHTNESS) != capabilities.end();
		EXPECT_EQ(mComposerClient->getDisplayBrightnessSupport(mPrimaryDisplay), hasBrightnessSupport);
		}

		TEST_F(GraphicsComposerHidlTest, getDisplayCapabilitiesBadDisplay) {
		@@ -604,24 +608,18 @@ TEST_F(GraphicsComposerHidlTest, SetLayerPerFrameMetadataBlobs) {
		}

		/*
		* Test that getDisplayBrightnessSupport works as expected.
		* Test that if brightness operations are supported, setDisplayBrightness works as expected.
		*/
		TEST_F(GraphicsComposerHidlTest, getDisplayBrightnessSupport) {
		TEST_F(GraphicsComposerHidlTest, setDisplayBrightness) {
		std::vector<IComposerClient::DisplayCapability> capabilities;
		const auto error = mComposerClient->getDisplayCapabilities(mPrimaryDisplay, &capabilities);
		ASSERT_EQ(Error::NONE, error);
		bool brightnessSupport =
		std::find(capabilities.begin(), capabilities.end(),
		IComposerClient::DisplayCapability::BRIGHTNESS) != capabilities.end();
		EXPECT_EQ(mComposerClient->getDisplayBrightnessSupport(mPrimaryDisplay), brightnessSupport);
		}

		/*
		* Test that if brightness operations are supported, setDisplayBrightness works as expected.
		*/
		TEST_F(GraphicsComposerHidlTest, setDisplayBrightness) {
		if (!mComposerClient->getDisplayBrightnessSupport(mPrimaryDisplay)) {
		EXPECT_EQ(mComposerClient->setDisplayBrightness(mPrimaryDisplay, 0.5f), Error::UNSUPPORTED);
		if (!brightnessSupport) {
		EXPECT_EQ(mComposerClient->getRaw()->setDisplayBrightness(mPrimaryDisplay, 0.5f),
		Error::UNSUPPORTED);
		GTEST_SUCCEED() << "Brightness operations are not supported";
		return;
		}

neuralnetworks/1.2/IBurstCallback.hal

+1 −1

Original line number	Diff line number	Diff line
		@@ -24,7 +24,7 @@ import @1.0::ErrorStatus;
		*/
		interface IBurstCallback {
		/**
		* Get the memory regions that correspond to slot ids. The slot ids are are
		* Get the memory regions that correspond to slot ids. The slot ids are
		* unique to the burst object.
		*
		* @param slots Values uniquely identifying memory regions within a Burst.