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

Commit 9fbde6a0 authored by Yu-Han Yang's avatar Yu-Han Yang Committed by Automerger Merge Worker
Browse files

Call close() in TearDown() am: 25cd9d67 

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



Change-Id: I9cc41bc3989788511d799ddaa6cf9b881f11c980
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e1185fa1 25cd9d67

gnss/aidl/android/hardware/gnss/IGnss.aidl

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ interface IGnss { 
     *

     * The framework calls this method to instruct the GPS engine to prepare for serving requests

     * from the framework. The GNSS HAL implementation must respond to all GNSS requests from the

     * framework upon successful return from this method until cleanup() method is called to

     * framework upon successful return from this method until close() method is called to

     * close this interface.

     *

     * @param callback Callback interface for IGnss.

gnss/aidl/vts/gnss_hal_test.cpp

+11 −0
Original line number Diff line number Diff line
@@ -107,6 +107,17 @@ void GnssHalTest::SetUpGnssCallback() { 
    }

}



void GnssHalTest::TearDown() {

    GnssHalTestTemplate<IGnss_V2_1>::TearDown();

    if (aidl_gnss_hal_ != nullptr) {

        aidl_gnss_hal_->close();

        aidl_gnss_hal_ = nullptr;

    }



    // Set to nullptr to destruct the callback event queues and warn of any unprocessed events.

    aidl_gnss_cb_ = nullptr;

}



void GnssHalTest::CheckLocation(const GnssLocation& location, bool check_speed) {

    Utils::checkLocation(location, check_speed, /* check_more_accuracies= */ true);

}

gnss/aidl/vts/gnss_hal_test.h

+1 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ class GnssHalTest : public android::hardware::gnss::common::GnssHalTestTemplate< 


    virtual void SetUp() override;

    virtual void SetUpGnssCallback() override;

    virtual void TearDown() override;



    void CheckLocation(const android::hardware::gnss::GnssLocation& location,

                       const bool check_speed);