Snap for 6796148 from 1a090f14b4becdb2a86b2062cbc153176dad8cea to rvc-qpr1-release (749d1cde) · Commits · e / os / android_hardware_interfaces

gnss/2.1/vts/functional/gnss_hal_test_cases.cpp

+18 −0

Original line number	Original line	Diff line number	Diff line
	@@ -363,6 +363,12 @@ IGnssConfiguration::BlacklistedSource FindStrongFrequentNonGpsSource(
	* formerly strongest satellite		* formerly strongest satellite
	*/		*/
	TEST_P(GnssHalTest, BlacklistIndividualSatellites) {		TEST_P(GnssHalTest, BlacklistIndividualSatellites) {
			if (!(gnss_cb_->last_capabilities_ & IGnssCallback_2_1::Capabilities::SATELLITE_BLACKLIST)) {
			ALOGI("Test BlacklistIndividualSatellites skipped. SATELLITE_BLACKLIST capability not "
			"supported.");
			return;
			}

	const int kLocationsToAwait = 3;		const int kLocationsToAwait = 3;
	const int kRetriesToUnBlacklist = 10;		const int kRetriesToUnBlacklist = 10;

	@@ -504,6 +510,12 @@ TEST_P(GnssHalTest, BlacklistIndividualSatellites) {
	* 4a & b) Clean up by turning off location, and send in empty blacklist.		* 4a & b) Clean up by turning off location, and send in empty blacklist.
	*/		*/
	TEST_P(GnssHalTest, BlacklistConstellationLocationOff) {		TEST_P(GnssHalTest, BlacklistConstellationLocationOff) {
			if (!(gnss_cb_->last_capabilities_ & IGnssCallback_2_1::Capabilities::SATELLITE_BLACKLIST)) {
			ALOGI("Test BlacklistConstellationLocationOff skipped. SATELLITE_BLACKLIST capability not "
			"supported.");
			return;
			}

	const int kLocationsToAwait = 3;		const int kLocationsToAwait = 3;
	const int kGnssSvInfoListTimeout = 2;		const int kGnssSvInfoListTimeout = 2;

	@@ -580,6 +592,12 @@ TEST_P(GnssHalTest, BlacklistConstellationLocationOff) {
	* 4a & b) Clean up by turning off location, and send in empty blacklist.		* 4a & b) Clean up by turning off location, and send in empty blacklist.
	*/		*/
	TEST_P(GnssHalTest, BlacklistConstellationLocationOn) {		TEST_P(GnssHalTest, BlacklistConstellationLocationOn) {
			if (!(gnss_cb_->last_capabilities_ & IGnssCallback_2_1::Capabilities::SATELLITE_BLACKLIST)) {
			ALOGI("Test BlacklistConstellationLocationOn skipped. SATELLITE_BLACKLIST capability not "
			"supported.");
			return;
			}

	const int kLocationsToAwait = 3;		const int kLocationsToAwait = 3;
	const int kGnssSvInfoListTimeout = 2;		const int kGnssSvInfoListTimeout = 2;

wifi/1.4/default/wifi_nan_iface.cpp

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -534,6 +534,9 @@ WifiNanIface::WifiNanIface(
	}		}

	void WifiNanIface::invalidate() {		void WifiNanIface::invalidate() {
			if (!isValid()) {
			return;
			}
	// send commands to HAL to actually disable and destroy interfaces		// send commands to HAL to actually disable and destroy interfaces
	legacy_hal_.lock()->nanDisableRequest(ifname_, 0xFFFF);		legacy_hal_.lock()->nanDisableRequest(ifname_, 0xFFFF);
	legacy_hal_.lock()->nanDataInterfaceDelete(ifname_, 0xFFFE, "aware_data0");		legacy_hal_.lock()->nanDataInterfaceDelete(ifname_, 0xFFFE, "aware_data0");