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

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

Merge "Stop location to avoid timing issue"

parents af5fc237 b983f103

gnss/1.1/vts/functional/gnss_hal_test.cpp

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

}



GnssConstellationType GnssHalTest::startLocationAndGetNonGpsConstellation() {

    const int kLocationsToAwait = 3;



    gnss_cb_->location_cbq_.reset();

    StartAndCheckLocations(kLocationsToAwait);

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

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

          kLocationsToAwait, 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);

        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_sv.constellation != GnssConstellationType::UNKNOWN) &&

                (gnss_sv.constellation != GnssConstellationType::GPS)) {

                // found a non-GPS constellation

                constellation_to_blacklist = gnss_sv.constellation;

                break;

            }

        }

        if (constellation_to_blacklist != GnssConstellationType::UNKNOWN) {

            break;

        }

    }



    if (constellation_to_blacklist == GnssConstellationType::UNKNOWN) {

        ALOGI("No non-GPS constellations found, constellation blacklist test less effective.");

        // Proceed functionally to blacklist something.

        constellation_to_blacklist = GnssConstellationType::GLONASS;

    }

    return constellation_to_blacklist;

}



GnssHalTest::GnssCallback::GnssCallback()

    : info_cbq_("system_info"),

      name_cbq_("name"),

gnss/1.1/vts/functional/gnss_hal_test.h

+11 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ using android::hardware::Void; 
using android::hardware::gnss::V1_0::GnssLocation;



using android::hardware::gnss::common::GnssCallbackEventQueue;

using android::hardware::gnss::V1_0::GnssConstellationType;

using android::hardware::gnss::V1_0::GnssLocationFlags;

using android::hardware::gnss::V1_1::IGnss;

using android::hardware::gnss::V1_1::IGnssCallback;
@@ -139,6 +140,16 @@ class GnssHalTest : public testing::TestWithParam<std::string> { 
     */

    bool IsGnssHalVersion_1_1() const;



    /*

     * startLocationAndGetNonGpsConstellation:

     * 1. Start location

     * 2. Find and return first non-GPS constellation

     *

     * Note that location is not stopped in this method. The client should call

     * StopAndClearLocations() after the call.

     */

    GnssConstellationType startLocationAndGetNonGpsConstellation();



    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

+65 −23
Original line number Diff line number Diff line
@@ -352,7 +352,7 @@ TEST_P(GnssHalTest, BlacklistIndividualSatellites) { 
}



/*

 * BlacklistConstellation:

 * BlacklistConstellationWithLocationOff:

 *

 * 1) Turns on location, waits for 3 locations, ensuring they are valid, and checks corresponding

 * GnssStatus for any non-GPS constellations.
@@ -361,50 +361,87 @@ TEST_P(GnssHalTest, BlacklistIndividualSatellites) { 
 * GnssStatus does not use any constellation but GPS.

 * 4a & b) Clean up by turning off location, and send in empty blacklist.

 */

TEST_P(GnssHalTest, BlacklistConstellation) {

TEST_P(GnssHalTest, BlacklistConstellationWithLocationOff) {

    if (!IsGnssHalVersion_1_1()) {

        ALOGI("Test BlacklistConstellation skipped. GNSS HAL version is greater than 1.1.");

        return;

    }



    const int kLocationsToAwait = 3;

    // Find first non-GPS constellation to blacklist

    GnssConstellationType constellation_to_blacklist = startLocationAndGetNonGpsConstellation();



    // Turns off location

    StopAndClearLocations();



    IGnssConfiguration::BlacklistedSource source_to_blacklist;

    source_to_blacklist.constellation = constellation_to_blacklist;

    source_to_blacklist.svid = 0;  // documented wildcard for all satellites in this constellation



    auto gnss_configuration_hal_return = gnss_hal_->getExtensionGnssConfiguration_1_1();

    ASSERT_TRUE(gnss_configuration_hal_return.isOk());

    sp<IGnssConfiguration> gnss_configuration_hal = gnss_configuration_hal_return;

    ASSERT_NE(gnss_configuration_hal, nullptr);



    hidl_vec<IGnssConfiguration::BlacklistedSource> sources;

    sources.resize(1);

    sources[0] = source_to_blacklist;



    // setBlacklist when location is off.

    auto result = gnss_configuration_hal->setBlacklist(sources);

    ASSERT_TRUE(result.isOk());

    EXPECT_TRUE(result);



    // retry and ensure constellation not used

    gnss_cb_->sv_status_cbq_.reset();



    gnss_cb_->location_cbq_.reset();

    StartAndCheckLocations(kLocationsToAwait);

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

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

          kLocationsToAwait, location_called_count);



    // Find first non-GPS constellation to blacklist

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

          kLocationsToAwait);

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

        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_sv.constellation != GnssConstellationType::UNKNOWN) &&

                (gnss_sv.constellation != GnssConstellationType::GPS)) {

                // found a non-GPS constellation

                constellation_to_blacklist = gnss_sv.constellation;

                break;

            }

            EXPECT_FALSE((gnss_sv.constellation == source_to_blacklist.constellation) &&

                         (gnss_sv.svFlag & IGnssCallback::GnssSvFlags::USED_IN_FIX));

        }

        if (constellation_to_blacklist != GnssConstellationType::UNKNOWN) {

            break;

    }



    // clean up

    StopAndClearLocations();

    sources.resize(0);

    result = gnss_configuration_hal->setBlacklist(sources);

    ASSERT_TRUE(result.isOk());

    EXPECT_TRUE(result);

}



    if (constellation_to_blacklist == GnssConstellationType::UNKNOWN) {

        ALOGI("No non-GPS constellations found, constellation blacklist test less effective.");

        // Proceed functionally to blacklist something.

        constellation_to_blacklist = GnssConstellationType::GLONASS;

/*

 * BlacklistConstellationWithLocationOn:

 *

 * 1) Turns on location, waits for 3 locations, ensuring they are valid, and checks corresponding

 * GnssStatus for any non-GPS constellations.

 * 2a & b) Turns off location, and blacklist first non-GPS constellations.

 * 3) Restart location, wait for 3 locations, ensuring they are valid, and checks corresponding

 * GnssStatus does not use any constellation but GPS.

 * 4a & b) Clean up by turning off location, and send in empty blacklist.

 */

TEST_P(GnssHalTest, BlacklistConstellationWithLocationOn) {

    if (!IsGnssHalVersion_1_1()) {

        ALOGI("Test BlacklistConstellation skipped. GNSS HAL version is greater than 1.1.");

        return;

    }



    const int kLocationsToAwait = 3;

    // Find first non-GPS constellation to blacklist

    GnssConstellationType constellation_to_blacklist = startLocationAndGetNonGpsConstellation();



    IGnssConfiguration::BlacklistedSource source_to_blacklist;

    source_to_blacklist.constellation = constellation_to_blacklist;

    source_to_blacklist.svid = 0;  // documented wildcard for all satellites in this constellation
@@ -418,10 +455,14 @@ TEST_P(GnssHalTest, BlacklistConstellation) { 
    sources.resize(1);

    sources[0] = source_to_blacklist;



    // setBlacklist when location is still on

    auto result = gnss_configuration_hal->setBlacklist(sources);

    ASSERT_TRUE(result.isOk());

    EXPECT_TRUE(result);



    // Turns off location

    StopAndClearLocations();



    // retry and ensure constellation not used

    gnss_cb_->sv_status_cbq_.reset();
@@ -429,10 +470,11 @@ TEST_P(GnssHalTest, BlacklistConstellation) { 
    StartAndCheckLocations(kLocationsToAwait);



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

    sv_status_cbq_size = gnss_cb_->sv_status_cbq_.size();

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

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