Snap for 4813226 from 739c3177ea3228a26ae7a8293158f417d6105dff to pi-release (2c3426b4) · Commits · e / os / android_hardware_interfaces

current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -342,7 +342,7 @@ a830336ac8627d6432cfafb1b884343ad9f885dee0a5323e380e6d3c519156b8 android.hardwar
		0b96e0254e2168cfecb30c1ed5fb42681652cc00faa68c6e07568fafe64d1d50 android.hardware.graphics.common@1.1::types
		7d2cef99c838fb58038de8bbfd3cdb76ff4797241987077721715297f8d45e34 android.hardware.graphics.common@1.1::types # b/78135149
		d9b40a5b09962a5a0780b10fe33a4e607e69e2e088fc83de88a584115b7cb1c0 android.hardware.graphics.composer@2.2::IComposer
		e7717f2ff2f6db43b24370ff08e14cd353da3004b32b17740e4a7ed4894b7e45 android.hardware.graphics.composer@2.2::IComposerClient
		a2f183f7fcc79aabedaef11095ab223aac0ed5ef984d850893872515e7f560c7 android.hardware.graphics.composer@2.2::IComposerClient
		dd83be076b6b3f10ed62ab34d8c8b95f2415961fb785200eb842e7bfb2b0ee92 android.hardware.graphics.mapper@2.1::IMapper
		675682dd3007805c985eaaec91612abc88f4c25b3431fb84070b7584a1a741fb android.hardware.health@2.0::IHealth
		434c4c32c00b0e54bb05e40c79503208b40f786a318029a2a4f66e34f10f2a76 android.hardware.health@2.0::IHealthInfoCallback

gnss/1.1/default/Gnss.cpp

+3 −1

Original line number	Diff line number	Diff line
		@@ -227,7 +227,9 @@ Return<GnssSvStatus> Gnss::getMockSvStatus() const {
		getSvInfo(5, GnssConstellationType::GPS, 27.0, 29.0, 56.5),
		getSvInfo(17, GnssConstellationType::GPS, 30.5, 71.0, 77.0),
		getSvInfo(26, GnssConstellationType::GPS, 24.1, 28.0, 253.0),
		getSvInfo(30, GnssConstellationType::GPS, 20.5, 11.5, 116.0),
		getSvInfo(5, GnssConstellationType::GLONASS, 20.5, 11.5, 116.0),
		getSvInfo(17, GnssConstellationType::GLONASS, 21.5, 28.5, 186.0),
		getSvInfo(18, GnssConstellationType::GLONASS, 28.3, 38.8, 69.0),
		getSvInfo(10, GnssConstellationType::GLONASS, 25.0, 66.0, 247.0)};

		GnssSvStatus svStatus = {.numSvs = sizeof(mockGnssSvInfoList) / sizeof(GnssSvInfo)};

gnss/1.1/vts/functional/gnss_hal_test_cases.cpp

+11 −6

Original line number	Diff line number	Diff line
		@@ -84,15 +84,15 @@ TEST_F(GnssHalTest, GetLocationLowPower) {
		}

		/*
		* FindStrongFrequentSource:
		* FindStrongFrequentNonGpsSource:
		*
		* Search through a GnssSvStatus list for the strongest satellite observed enough times
		* Search through a GnssSvStatus list for the strongest non-GPS satellite observed enough times
		*
		* returns the strongest source,
		* or a source with constellation == UNKNOWN if none are found sufficient times
		*/

		IGnssConfiguration::BlacklistedSource FindStrongFrequentSource(
		IGnssConfiguration::BlacklistedSource FindStrongFrequentNonGpsSource(
		const list<IGnssCallback::GnssSvStatus> list_gnss_sv_status, const int min_observations) {
		struct ComparableBlacklistedSource {
		IGnssConfiguration::BlacklistedSource id;
		@@ -113,7 +113,8 @@ IGnssConfiguration::BlacklistedSource FindStrongFrequentSource(
		for (const auto& gnss_sv_status : list_gnss_sv_status) {
		for (uint32_t iSv = 0; iSv < gnss_sv_status.numSvs; iSv++) {
		const auto& gnss_sv = gnss_sv_status.gnssSvList[iSv];
		if (gnss_sv.svFlag & IGnssCallback::GnssSvFlags::USED_IN_FIX) {
		if ((gnss_sv.svFlag & IGnssCallback::GnssSvFlags::USED_IN_FIX) &&
		(gnss_sv.constellation != GnssConstellationType::GPS)) {
		ComparableBlacklistedSource source;
		source.id.svid = gnss_sv.svid;
		source.id.constellation = gnss_sv.constellation;
		@@ -187,8 +188,12 @@ TEST_F(GnssHalTest, BlacklistIndividualSatellites) {
		*/

		IGnssConfiguration::BlacklistedSource source_to_blacklist =
		FindStrongFrequentSource(list_gnss_sv_status_, kLocationsToAwait - 1);
		EXPECT_NE(source_to_blacklist.constellation, GnssConstellationType::UNKNOWN);
		FindStrongFrequentNonGpsSource(list_gnss_sv_status_, kLocationsToAwait - 1);

		if (source_to_blacklist.constellation == GnssConstellationType::UNKNOWN) {
		// Cannot find a non-GPS satellite. Let the test pass.
		return;
		}

		// Stop locations, blacklist the common SV
		StopAndClearLocations();

graphics/composer/2.1/vts/functional/VtsHalGraphicsComposerV2_1TargetTest.cpp

+8 −1

Original line number	Diff line number	Diff line
		@@ -292,11 +292,18 @@ TEST_F(GraphicsComposerHidlTest, SetActiveConfig) {
		* Test that IComposerClient::setColorMode succeeds for all color modes.
		*/
		TEST_F(GraphicsComposerHidlTest, SetColorMode) {
		std::unordered_set<ColorMode> validModes;
		for (auto mode : hidl_enum_iterator<ColorMode>()) {
		validModes.insert(mode);
		}

		std::vector<ColorMode> modes = mComposerClient->getColorModes(mPrimaryDisplay);
		for (auto mode : modes) {
		if (validModes.count(mode)) {
		mComposerClient->setColorMode(mPrimaryDisplay, mode);
		}
		}
		}

		/**
		* Test IComposerClient::setPowerMode.

graphics/composer/2.2/IComposerClient.hal

+2 −1

Original line number	Diff line number	Diff line
		@@ -355,7 +355,8 @@ interface IComposerClient extends @2.1::IComposerClient {
		* Returns the render intents supported by the specified display and color
		* mode.
		*
		* RenderIntent::COLORIMETRIC is always supported.
		* For SDR color modes, RenderIntent::COLORIMETRIC must be supported. For
		* HDR color modes, RenderIntent::TONE_MAP_COLORIMETRIC must be supported.
		*
		* @param display is the display to query.
		* @param mode is the color mode to query.