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

Commit 75b35de2 authored by Yu-Han Yang's avatar Yu-Han Yang
Browse files

Add isEmergency flag to gnssRequestLocationCb 

Bug: 124106337

Test: atest VtsHalGnssV2_0TargetTest
Change-Id: I1d89b4065e3f40b5a4e0714bacd3e305aa94eaa0
parent 0d7a65f7

current.txt

+1 −1
Original line number Diff line number Diff line
@@ -465,7 +465,7 @@ f27baaa587bc3dd9b740cb6928ab812b9b7d105b5187663938aee578105f3c39 android.hardwar 
2e5ad983734069e84a760004b32da0d09e4170c05380abe27e6eb80e4aa70d5a android.hardware.gnss@2.0::IAGnssCallback

1f4ac068a88a72360280d94a7f6fd7c63813c1eea4891a0eb01394d3e7e775f2 android.hardware.gnss@2.0::IAGnssRil

6e2f9a44375a0ae0b49ca7d711cb88945189d398535078408269e1e85889061d android.hardware.gnss@2.0::IGnss

54d253b10c7da2a4a708d11acda3118b283df1540bc10323a5a3773c94cc8e71 android.hardware.gnss@2.0::IGnssCallback

d815623a6d1ba4abf21248b84eca70a2bfab03058a88b68a29c063ce8aee6b5c android.hardware.gnss@2.0::IGnssCallback

ecc966c68bddbd95c8dae782b84204cf01c75734675e8769963f3b5106ec128b android.hardware.gnss@2.0::IGnssConfiguration

c67759f5d6387d273b66729180d03690e827f0b6b8d4e13ce2ff42d31b224065 android.hardware.gnss@2.0::IGnssMeasurement

089338944c45f66f25ba4ee958c161c42fefeb73ec60e4451f3535a1b3fd10c7 android.hardware.gnss@2.0::IGnssMeasurementCallback

gnss/2.0/IGnssCallback.hal

+23 −0
Original line number Diff line number Diff line
@@ -52,4 +52,27 @@ interface IGnssCallback extends @1.1::IGnssCallback { 
     */

    gnssLocationCb_2_0(GnssLocation location);



    /**

     * Callback for requesting Location.

     *

     * HAL implementation must call this when it wants the framework to provide locations to assist

     * with GNSS HAL operation, for example, to assist with time to first fix, error recovery, or to

     * supplement GNSS location for other clients of the GNSS HAL.

     *

     * If a request is made with independentFromGnss set to true, the framework must avoid

     * providing locations derived from GNSS locations (such as "fused" location), to help improve

     * information independence for situations such as error recovery.

     *

     * In response to this method call, GNSS HAL can expect zero, one, or more calls to

     * IGnss::injectLocation or IGnss::injectBestLocation, dependent on availability of location

     * from other sources, which may happen at some arbitrary delay. Generally speaking, HAL

     * implementations must be able to handle calls to IGnss::injectLocation or

     * IGnss::injectBestLocation at any time.

     *

     * @param independentFromGnss True if requesting a location that is independent from GNSS.

     * @param isUserEmergency True if the location request is for delivery of this location to an

     *        emergency services endpoint, during a user-initiated emergency session (e.g.

     *        during-call to E911, or up to 5 minutes after end-of-call or text to E911).

     */

    gnssRequestLocationCb_2_0(bool independentFromGnss, bool isUserEmergency);

};
 
 No newline at end of file

gnss/2.0/vts/functional/gnss_hal_test.h

+8 −2
Original line number Diff line number Diff line
@@ -99,12 +99,18 @@ class GnssHalTest : public ::testing::VtsHalHidlTargetTestBase { 
        // Actual (test) callback handlers

        Return<void> gnssNameCb(const android::hardware::hidl_string& name) override;

        Return<void> gnssLocationCb(const GnssLocation_1_0& location) override;

        Return<void> gnssLocationCb_2_0(const GnssLocation_2_0& location) override;

        Return<void> gnssSetCapabilitesCb(uint32_t capabilities) override;

        Return<void> gnssSetCapabilitiesCb_2_0(uint32_t capabilities) override;

        Return<void> gnssSetSystemInfoCb(const IGnssCallback::GnssSystemInfo& info) override;

        Return<void> gnssSvStatusCb(const IGnssCallback::GnssSvStatus& svStatus) override;



        // New in v2.0

        Return<void> gnssLocationCb_2_0(const GnssLocation_2_0& location) override;

        Return<void> gnssRequestLocationCb_2_0(bool /* independentFromGnss */,

                                               bool /* isUserEmergency */) override {

            return Void();

        }

        Return<void> gnssSetCapabilitiesCb_2_0(uint32_t capabilities) override;



      private:

        Return<void> gnssLocationCbImpl(const GnssLocation_2_0& location);

    };