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

Commit 31eea85f authored by Sasha Kuznetsov's avatar Sasha Kuznetsov
Browse files

Create measurement corrections 1.1 with eBearing 

Test: matest VtsHalGnssV2_1TargetTesti and manually injected
dummy measurement corrections in GnssLocationProvider and
verified that cuttlefish implementation properly recieved
them below the HAL
Bug: 145963440
Change-Id: Ib5eb4f8c759c91b9fa2217ce6658319edd11bb27
parent c9464216

current.txt

+3 −1
Original line number Original line Diff line number Diff line
@@ -639,11 +639,13 @@ f18695dd36ee205640b8326a17453858a7b4596653aaa6ef0016b0aef1bd4dac android.hardwar 
881aa8720fb1d69aa9843bfab69d810ab7654a61d2f5ab5e2626cbf240f24eaf android.hardware.dumpstate@1.1::types

881aa8720fb1d69aa9843bfab69d810ab7654a61d2f5ab5e2626cbf240f24eaf android.hardware.dumpstate@1.1::types

13b33f623521ded51a6c0f7ea5b77e97066d0aa1e38a83c2873f08ad67294f89 android.hardware.dumpstate@1.1::IDumpstateDevice

13b33f623521ded51a6c0f7ea5b77e97066d0aa1e38a83c2873f08ad67294f89 android.hardware.dumpstate@1.1::IDumpstateDevice

769d346927a94fd40ee80a5a976d8d15cf022ef99c5900738f4a82f26c0ed229 android.hardware.gnss@2.1::types

769d346927a94fd40ee80a5a976d8d15cf022ef99c5900738f4a82f26c0ed229 android.hardware.gnss@2.1::types

3dacec7801968e1e4479724dc0180442d9e915466bff051f80996266b1a51c2c android.hardware.gnss@2.1::IGnss

88371e0edf69a1f72bfc45ecb2335e9b145e87339d3eecc92664a1fb200213ba android.hardware.gnss@2.1::IGnss

ba62e1e8993bfb9f27fa04816fa0f2241ae2d01edfa3d0c04182e2e5de80045c android.hardware.gnss@2.1::IGnssCallback

ba62e1e8993bfb9f27fa04816fa0f2241ae2d01edfa3d0c04182e2e5de80045c android.hardware.gnss@2.1::IGnssCallback

ccdf3c0fb2c02a6d4dc57afb276c3497ae8172b80b00ebc0bf8a0238dd38b01d android.hardware.gnss@2.1::IGnssConfiguration

ccdf3c0fb2c02a6d4dc57afb276c3497ae8172b80b00ebc0bf8a0238dd38b01d android.hardware.gnss@2.1::IGnssConfiguration

5a125c49ca83629e22afc8c39e865509343bfa2c38f0baea9a186bbac103492d android.hardware.gnss@2.1::IGnssMeasurement

5a125c49ca83629e22afc8c39e865509343bfa2c38f0baea9a186bbac103492d android.hardware.gnss@2.1::IGnssMeasurement

d7bf37660a0946de9599dcbae997b077ee3e604fc2044534d40d3da04297a5d3 android.hardware.gnss@2.1::IGnssMeasurementCallback

d7bf37660a0946de9599dcbae997b077ee3e604fc2044534d40d3da04297a5d3 android.hardware.gnss@2.1::IGnssMeasurementCallback

6670e7780803a8c696c6391fda5589a334b1b37dc7be9393792ed35035413633 android.hardware.gnss.measurement_corrections@1.1::IMeasurementCorrections

a3f439b782a6a92aaf3c0250f3526e94e8bf8844c3d578f0815e21b12c431346 android.hardware.gnss.measurement_corrections@1.1::types

ce8dbe76eb9ee94b46ef98f725be992e760a5751073d4f4912484026541371f3 android.hardware.health@2.1::IHealth

ce8dbe76eb9ee94b46ef98f725be992e760a5751073d4f4912484026541371f3 android.hardware.health@2.1::IHealth

26f04510a0b57aba5167c5c0a7c2f077c2acbb98b81902a072517829fd9fd67f android.hardware.health@2.1::IHealthInfoCallback

26f04510a0b57aba5167c5c0a7c2f077c2acbb98b81902a072517829fd9fd67f android.hardware.health@2.1::IHealthInfoCallback

db47f4ceceb1f06c656f39caa70c557b0f8471ef59fd58611bea667ffca20101 android.hardware.health@2.1::types

db47f4ceceb1f06c656f39caa70c557b0f8471ef59fd58611bea667ffca20101 android.hardware.health@2.1::types

gnss/1.1/vts/functional/Android.bp

+5 −1
Original line number Original line Diff line number Diff line
@@ -29,6 +29,10 @@ cc_test { 
    ],

    ],

    shared_libs: [

    shared_libs: [

        "android.hardware.gnss.measurement_corrections@1.0",

        "android.hardware.gnss.measurement_corrections@1.0",

        "android.hardware.gnss.measurement_corrections@1.1",

    ],

    test_suites: [

        "general-tests",

        "vts-core",

    ],

    ],

    test_suites: ["general-tests", "vts-core"],

}
 
}

gnss/2.0/vts/functional/gnss_hal_test_cases.cpp

+6 −0
Original line number Original line Diff line number Diff line
@@ -296,6 +296,12 @@ TEST_P(GnssHalTest, TestGnssVisibilityControlExtension) { 
 * capability flag is set.

 * capability flag is set.

 */

 */

TEST_P(GnssHalTest, TestGnssMeasurementCorrectionsCapabilities) {

TEST_P(GnssHalTest, TestGnssMeasurementCorrectionsCapabilities) {

    if (!IsGnssHalVersion_2_0()) {

        ALOGI("Test GnssMeasurementCorrectionsCapabilities skipped. GNSS HAL version is greater "

              "than 2.0.");

        return;

    }



    if (!(gnss_cb_->last_capabilities_ & IGnssCallback::Capabilities::MEASUREMENT_CORRECTIONS)) {

    if (!(gnss_cb_->last_capabilities_ & IGnssCallback::Capabilities::MEASUREMENT_CORRECTIONS)) {

        return;

        return;

    }

    }

gnss/2.1/Android.bp

+1 −0
Original line number Original line Diff line number Diff line
@@ -15,6 +15,7 @@ hidl_interface { 
        "IGnssConfiguration.hal",

        "IGnssConfiguration.hal",

    ],

    ],

    interfaces: [

    interfaces: [

        "android.hardware.gnss.measurement_corrections@1.1",

        "android.hardware.gnss.measurement_corrections@1.0",

        "android.hardware.gnss.measurement_corrections@1.0",

        "android.hardware.gnss.visibility_control@1.0",

        "android.hardware.gnss.visibility_control@1.0",

        "android.hardware.gnss@1.0",

        "android.hardware.gnss@1.0",

gnss/2.1/IGnss.hal

+11 −0
Original line number Original line Diff line number Diff line
@@ -16,6 +16,7 @@ 




package android.hardware.gnss@2.1;

package android.hardware.gnss@2.1;





import android.hardware.gnss.measurement_corrections@1.1::IMeasurementCorrections;

import @2.0::IGnss;

import @2.0::IGnss;





import IGnssCallback;

import IGnssCallback;
@@ -62,4 +63,14 @@ interface IGnss extends @2.0::IGnss { 
     * @return gnssConfigurationIface Handle to the IGnssConfiguration interface.

     * @return gnssConfigurationIface Handle to the IGnssConfiguration interface.

     */

     */

    getExtensionGnssConfiguration_2_1() generates (IGnssConfiguration gnssConfigurationIface);

    getExtensionGnssConfiguration_2_1() generates (IGnssConfiguration gnssConfigurationIface);



    /**

     * This method returns the IMeasurementCorrections interface.

     *

     * Both getExtensionMeasurementCorrections and getExtensionMeasurementCorrections_1_1 must

     * return non-null. Both methods can return the same V1.1 IMeasurementCorrections object.

     *

     * @return measurementCorrectionsIface Handle to the IMeasurementCorrections interface.

     */

     getExtensionMeasurementCorrections_1_1() generates (IMeasurementCorrections measurementCorrectionsIface);

};
 
};
 
 No newline at end of file