Merge "Minor fixes on VTS tests" into tm-dev

This commit is contained in:
TreeHugger Robot
2022-06-10 01:15:37 +00:00
committed by Android (Google) Code Review
2 changed files with 10 additions and 8 deletions

View File

@@ -141,18 +141,18 @@ bool GnssHalTest::StartAndCheckFirstLocation(const int min_interval_msec, const
}
SetPositionMode(min_interval_msec, low_power_mode);
auto status = aidl_gnss_hal_->start();
EXPECT_TRUE(status.isOk());
if (start_sv_status) {
status = aidl_gnss_hal_->startSvStatus();
auto status = aidl_gnss_hal_->startSvStatus();
EXPECT_TRUE(status.isOk());
}
if (start_nmea) {
status = aidl_gnss_hal_->startNmea();
auto status = aidl_gnss_hal_->startNmea();
EXPECT_TRUE(status.isOk());
}
auto status = aidl_gnss_hal_->start();
EXPECT_TRUE(status.isOk());
/*
* GnssLocationProvider support of AGPS SUPL & XtraDownloader is not available in VTS,
* so allow time to demodulate ephemeris over the air.

View File

@@ -291,10 +291,12 @@ TEST_P(GnssHalTest, TestGnssSvInfoFields) {
EXPECT_GT(aidl_gnss_cb_->sv_info_list_cbq_.retrieve(sv_info_lists, kNumSvInfoLists,
kTimeoutSeconds),
0);
last_sv_info_list = sv_info_lists.back();
} while (last_sv_info_list.size() == 0);
if (!sv_info_lists.empty()) {
last_sv_info_list = sv_info_lists.back();
ALOGD("last_sv_info size = %d", (int)last_sv_info_list.size());
}
} while (!sv_info_lists.empty() && last_sv_info_list.size() == 0);
ALOGD("last_sv_info size = %d", (int)last_sv_info_list.size());
bool nonZeroCn0Found = false;
for (auto sv_info : last_sv_info_list) {
EXPECT_TRUE(sv_info.basebandCN0DbHz >= 0.0 && sv_info.basebandCN0DbHz <= 65.0);