Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 85fd31c9 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove duplicate constants."

parents 258dd3ba fdfd6f9d

gnss/1.1/vts/functional/gnss_hal_test.cpp

+6 −8
Original line number Diff line number Diff line
@@ -175,25 +175,23 @@ bool GnssHalTest::IsGnssHalVersion_1_1() const { 
    return hasGnssHalVersion_1_1 && !hasGnssHalVersion_2_0;

}



GnssConstellationType GnssHalTest::startLocationAndGetNonGpsConstellation() {

    const int kLocationsToAwait = 3;



GnssConstellationType GnssHalTest::startLocationAndGetNonGpsConstellation(

        const int locations_to_await, const int gnss_sv_info_list_timeout) {

    gnss_cb_->location_cbq_.reset();

    StartAndCheckLocations(kLocationsToAwait);

    StartAndCheckLocations(locations_to_await);

    const int location_called_count = gnss_cb_->location_cbq_.calledCount();



    // Tolerate 1 less sv status to handle edge cases in reporting.

    int sv_status_cbq_size = gnss_cb_->sv_status_cbq_.size();

    EXPECT_GE(sv_status_cbq_size + 1, kLocationsToAwait);

    EXPECT_GE(sv_status_cbq_size + 1, locations_to_await);

    ALOGD("Observed %d GnssSvStatus, while awaiting %d Locations (%d received)", sv_status_cbq_size,

          kLocationsToAwait, location_called_count);

          locations_to_await, location_called_count);



    // Find first non-GPS constellation to blacklist

    const int kGnssSvStatusTimeout = 2;

    GnssConstellationType constellation_to_blacklist = GnssConstellationType::UNKNOWN;

    for (int i = 0; i < sv_status_cbq_size; ++i) {

        IGnssCallback::GnssSvStatus gnss_sv_status;

        gnss_cb_->sv_status_cbq_.retrieve(gnss_sv_status, kGnssSvStatusTimeout);

        gnss_cb_->sv_status_cbq_.retrieve(gnss_sv_status, gnss_sv_info_list_timeout);

        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) &&

gnss/1.1/vts/functional/gnss_hal_test.h

+2 −1
Original line number Diff line number Diff line
@@ -148,7 +148,8 @@ class GnssHalTest : public testing::TestWithParam<std::string> { 
     * Note that location is not stopped in this method. The client should call

     * StopAndClearLocations() after the call.

     */

    GnssConstellationType startLocationAndGetNonGpsConstellation();

    GnssConstellationType startLocationAndGetNonGpsConstellation(

            const int locations_to_await, const int gnss_sv_info_list_timeout);



    sp<IGnss> gnss_hal_;         // GNSS HAL to call into

    sp<GnssCallback> gnss_cb_;   // Primary callback interface

gnss/1.1/vts/functional/gnss_hal_test_cases.cpp

+8 −4
Original line number Diff line number Diff line
@@ -368,8 +368,11 @@ TEST_P(GnssHalTest, BlacklistConstellationWithLocationOff) { 
    }



    const int kLocationsToAwait = 3;

    const int kGnssSvStatusTimeout = 2;



    // Find first non-GPS constellation to blacklist

    GnssConstellationType constellation_to_blacklist = startLocationAndGetNonGpsConstellation();

    GnssConstellationType constellation_to_blacklist =

            startLocationAndGetNonGpsConstellation(kLocationsToAwait, kGnssSvStatusTimeout);



    // Turns off location

    StopAndClearLocations();
@@ -403,7 +406,6 @@ TEST_P(GnssHalTest, BlacklistConstellationWithLocationOff) { 
    EXPECT_GE(sv_status_cbq_size + 1, kLocationsToAwait);

    ALOGD("Observed %d GnssSvStatus, while awaiting %d Locations", sv_status_cbq_size,

          kLocationsToAwait);

    const int kGnssSvStatusTimeout = 2;

    for (int i = 0; i < sv_status_cbq_size; ++i) {

        IGnssCallback::GnssSvStatus gnss_sv_status;

        gnss_cb_->sv_status_cbq_.retrieve(gnss_sv_status, kGnssSvStatusTimeout);
@@ -439,8 +441,11 @@ TEST_P(GnssHalTest, BlacklistConstellationWithLocationOn) { 
    }



    const int kLocationsToAwait = 3;

    const int kGnssSvStatusTimeout = 2;



    // Find first non-GPS constellation to blacklist

    GnssConstellationType constellation_to_blacklist = startLocationAndGetNonGpsConstellation();

    GnssConstellationType constellation_to_blacklist =

            startLocationAndGetNonGpsConstellation(kLocationsToAwait, kGnssSvStatusTimeout);



    IGnssConfiguration::BlacklistedSource source_to_blacklist;

    source_to_blacklist.constellation = constellation_to_blacklist;
@@ -474,7 +479,6 @@ TEST_P(GnssHalTest, BlacklistConstellationWithLocationOn) { 
    EXPECT_GE(sv_status_cbq_size + 1, kLocationsToAwait);

    ALOGD("Observed %d GnssSvStatus, while awaiting %d Locations", sv_status_cbq_size,

          kLocationsToAwait);

    const int kGnssSvStatusTimeout = 2;

    for (int i = 0; i < sv_status_cbq_size; ++i) {

        IGnssCallback::GnssSvStatus gnss_sv_status;

        gnss_cb_->sv_status_cbq_.retrieve(gnss_sv_status, kGnssSvStatusTimeout);