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

Commit 9d1699b5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "JNI Fix for gnss assistance." into main

parents 0ea64403 8f42e8d0

services/core/jni/gnss/GnssAssistance.cpp

+176 −60

File changed.

Preview size limit exceeded, changes collapsed.

services/core/jni/gnss/GnssAssistance.h

+5 −3
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ using GnssAlmanac = android::hardware::gnss::gnss_assistance::GnssAlmanac; 
using GnssSatelliteCorrections =

        android::hardware::gnss::gnss_assistance::GnssAssistance::GnssSatelliteCorrections;

using GpsSatelliteEphemeris = android::hardware::gnss::gnss_assistance::GpsSatelliteEphemeris;

using QzssSatelliteEphemeris = android::hardware::gnss::gnss_assistance::QzssSatelliteEphemeris;

using SatelliteEphemerisTime = android::hardware::gnss::gnss_assistance::SatelliteEphemerisTime;

using UtcModel = android::hardware::gnss::gnss_assistance::UtcModel;

using LeapSecondsModel = android::hardware::gnss::gnss_assistance::LeapSecondsModel;
@@ -101,11 +102,12 @@ struct GnssAssistanceUtil { 
                                  GnssAssistance& gnssAssistance);

    static void setGpsAssistance(JNIEnv* env, jobject gpsAssistanceObj,

                                 std::optional<GpsAssistance>& gpsAssistanceOpt);

    template <class T>

    static void setGpsOrQzssSatelliteEphemeris(JNIEnv* env, jobject satelliteEphemerisObj,

                                               std::vector<T>& satelliteEphemeris);

    static void setGpsSatelliteEphemeris(JNIEnv* env, jobject satelliteEphemerisObj,

                                         std::vector<GpsSatelliteEphemeris>& satelliteEphemeris);

    static void setQzssAssistance(JNIEnv* env, jobject qzssAssistanceObj,

                                  std::optional<QzssAssistance>& qzssAssistanceOpt);

    static void setQzssSatelliteEphemeris(JNIEnv* env, jobject satelliteEphemerisObj,

                                          std::vector<QzssSatelliteEphemeris>& satelliteEphemeris);

    static void setGnssAlmanac(JNIEnv* env, jobject gnssAlmanacObj,

                               std::optional<GnssAlmanac>& gnssAlmanacOpt);

    static void setGnssSignalType(JNIEnv* env, jobject gnssSignalTypeObj,