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

Commit 3fbf6e53 authored by Yu-Han Yang's avatar Yu-Han Yang
Browse files

Implement gnssMeasurementCb_2_0 

Bug: 119571122
Change-Id: I3623cd2e8d11c1e4572e770a69179d8d9ac05ac1
Fixes: 119571122
Test: CTS (GnssMeasurementRegistrationTest) passed on cuttlefish
parent a32c79d3

services/core/jni/com_android_server_location_GnssLocationProvider.cpp

+14 −4
Original line number Diff line number Diff line
@@ -856,7 +856,7 @@ struct GnssMeasurementCallback : public IGnssMeasurementCallback_V2_0 { 


Return<void> GnssMeasurementCallback::gnssMeasurementCb_2_0(

        const IGnssMeasurementCallback_V2_0::GnssData& data) {

    // TODO(b/119571122): implement gnssMeasurementCb_2_0

    translateAndSetGnssData(data);

    return Void();

}
@@ -894,9 +894,8 @@ size_t GnssMeasurementCallback::getMeasurementCount<IGnssMeasurementCallback_V1_ 
    return data.measurementCount;

}



template<>

size_t GnssMeasurementCallback::getMeasurementCount<IGnssMeasurementCallback_V1_1::GnssData>

        (const IGnssMeasurementCallback_V1_1::GnssData& data) {

template<class T>

size_t GnssMeasurementCallback::getMeasurementCount(const T& data) {

    return data.measurements.size();

}
@@ -958,6 +957,17 @@ void GnssMeasurementCallback::translateSingleGnssMeasurement 
            ADR_STATE_HALF_CYCLE_REPORTED));

}



// Preallocate object as: JavaObject object(env, "android/location/GnssMeasurement");

template<>

void GnssMeasurementCallback::translateSingleGnssMeasurement

        <IGnssMeasurementCallback_V2_0::GnssMeasurement>(

        const IGnssMeasurementCallback_V2_0::GnssMeasurement* measurement_V2_0,

        JavaObject& object) {

    translateSingleGnssMeasurement(&(measurement_V2_0->v1_1), object);



    SET(CodeType, (static_cast<int32_t>(measurement_V2_0->codeType)));

}



jobject GnssMeasurementCallback::translateGnssClock(

       JNIEnv* env, const IGnssMeasurementCallback_V1_0::GnssClock* clock) {

    JavaObject object(env, "android/location/GnssClock");