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

Commit 0e8af9f2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Minor fixes on VTS tests" into tm-dev am: 079b3790 

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/18821608



Change-Id: I88b268efa823c12d3bf7c1125d13ab646c12cfd0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6925ef01 079b3790

gnss/aidl/vts/gnss_hal_test.cpp

+5 −5
Original line number Diff line number Diff line
@@ -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.

gnss/aidl/vts/gnss_hal_test_cases.cpp

+5 −3
Original line number Diff line number Diff line
@@ -291,10 +291,12 @@ TEST_P(GnssHalTest, TestGnssSvInfoFields) { 
        EXPECT_GT(aidl_gnss_cb_->sv_info_list_cbq_.retrieve(sv_info_lists, kNumSvInfoLists,

                                                            kTimeoutSeconds),

                  0);

        if (!sv_info_lists.empty()) {

            last_sv_info_list = sv_info_lists.back();

    } while (last_sv_info_list.size() == 0);



            ALOGD("last_sv_info size = %d", (int)last_sv_info_list.size());

        }

    } while (!sv_info_lists.empty() && last_sv_info_list.size() == 0);



    bool nonZeroCn0Found = false;

    for (auto sv_info : last_sv_info_list) {

        EXPECT_TRUE(sv_info.basebandCN0DbHz >= 0.0 && sv_info.basebandCN0DbHz <= 65.0);