commit f092f33ee7f609f0a55f575d04f77cb108c6952f
author bohu <bohu@google.com> Thu Jun 20 15:53:32 2019 -0700
committer Roman Kiryanov <rkir@google.com> Mon Dec 30 10:19:21 2019 -0800
tree 965ad215a9886a088476f142e7cb9bfedf7fe0dd
parent dc083b9f4d51b783c3ffc8263937cf6f1ded1f86

goldfish: use gnss_sv_status instead of gps_sv_status

As gps_sv_status is deprecated, and fails one cts test

Bug: 134772959
Test: CtsLocationTestCases android.location.cts.GnssStatusTest#testGnssStatusValues
Change-Id: I87ec99163e55ead3638da34d03586b2bc281ddf8
Merged-In: I2fe8b834e18e11891f998e96230f36023b6d10ad
Signed-off-by: Roman Kiryanov <rkir@google.com>

gps/gps_qemu.c

diff --git a/gps/gps_qemu.c b/gps/gps_qemu.c
index 59d2f4e..8577ec1 100644
--- a/gps/gps_qemu.c
+++ b/gps/gps_qemu.c
@@ -773,15 +773,18 @@
     int         control_fd = state->control[1];
     GpsStatus gps_status;
     gps_status.size = sizeof(gps_status);
-    GpsSvStatus  gps_sv_status;
-    memset(&gps_sv_status, 0, sizeof(gps_sv_status));
-    gps_sv_status.size = sizeof(gps_sv_status);
-    gps_sv_status.num_svs = 1;
-    gps_sv_status.sv_list[0].size = sizeof(gps_sv_status.sv_list[0]);
-    gps_sv_status.sv_list[0].prn = 17;
-    gps_sv_status.sv_list[0].snr = 60.0;
-    gps_sv_status.sv_list[0].elevation = 30.0;
-    gps_sv_status.sv_list[0].azimuth = 30.0;
+
+    GnssSvStatus  gnss_sv_status;
+    memset(&gnss_sv_status, 0, sizeof(gnss_sv_status));
+    gnss_sv_status.size = sizeof(gnss_sv_status);
+    gnss_sv_status.num_svs = 1;
+    gnss_sv_status.gnss_sv_list[0].size = sizeof(gnss_sv_status.gnss_sv_list[0]);
+    gnss_sv_status.gnss_sv_list[0].svid = 17;
+    gnss_sv_status.gnss_sv_list[0].constellation = GNSS_CONSTELLATION_GPS;
+    gnss_sv_status.gnss_sv_list[0].c_n0_dbhz = 60.0;
+    gnss_sv_status.gnss_sv_list[0].elevation = 30.0;
+    gnss_sv_status.gnss_sv_list[0].azimuth = 30.0;
+    gnss_sv_status.gnss_sv_list[0].flags = GNSS_SV_FLAGS_HAS_CARRIER_FREQUENCY;
 
     nmea_reader_init( reader );
 
@@ -801,8 +804,8 @@
             timeout = 10 * 1000; // 10 seconds
         }
         nevents = epoll_wait( epoll_fd, events, 2, timeout );
-        if (state->callbacks.sv_status_cb) {
-            state->callbacks.sv_status_cb(&gps_sv_status);
+        if (state->callbacks.gnss_sv_status_cb) {
+            state->callbacks.gnss_sv_status_cb(&gnss_sv_status);
         }
         // update satilite info
         if (nevents < 0) {