commit 5cad76dac9eab4aa119ae538bf42b10320e12050
author Ahmad Rahmati <rahmati@google.com> Thu Sep 24 06:01:03 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Sep 24 06:01:03 2020 +0000
tree e9286054c097d6e8a8d8693cc0330785027ce3c7
parent d3c190993d86b35d235c1b219d5dd529a19c6705
parent c825b356a0392a715109db8196dacc1e8a2b06e0

Use Parser Code for GNSS CHPP->CHRE Conversion am: c825b356a0

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/chre/+/12674979

Change-Id: I6530a35e12472c52cefa3a1a52c1d7077bfc1ebd

chpp/clients/gnss.c

diff --git a/chpp/clients/gnss.c b/chpp/clients/gnss.c
index 4aec70d..31415b8 100644
--- a/chpp/clients/gnss.c
+++ b/chpp/clients/gnss.c
@@ -444,27 +444,22 @@
 static void chppGnssLocationResultNotification(
     struct ChppGnssClientState *clientContext, uint8_t *buf, size_t len) {
   UNUSED_VAR(clientContext);
+  CHPP_LOGD("chppGnssLocationResultNotification received data len=%" PRIuSIZE,
+            len);
 
-  if (len < sizeof(struct ChppGnssLocationEventWithHeader)) {
-    CHPP_LOGE("GNSS LocationResultNotification too short");
+  buf += sizeof(struct ChppAppHeader);
+  len -= sizeof(struct ChppAppHeader);
 
+  struct chreGnssLocationEvent *chre =
+      chppGnssLocationEventToChre((struct ChppGnssLocationEvent *)buf, len);
+
+  if (chre == NULL) {
+    CHPP_LOGE(
+        "chppGnssLocationResultNotification CHPP -> CHRE conversion failed. "
+        "Input len=%" PRIuSIZE,
+        len);
   } else {
-    CHPP_LOGD("chppGnssLocationResultNotification received location");
-
-    // TODO: Use parser script instead. i.e. chppGnssLocationEventToChre()
-    struct ChppGnssLocationEventWithHeader *chppEvent =
-        (struct ChppGnssLocationEventWithHeader *)buf;
-    struct chreGnssLocationEvent *chreResult =
-        chppMalloc(sizeof(struct chreGnssLocationEvent));
-
-    if (chreResult == NULL) {
-      CHPP_LOG_OOM();
-
-    } else {
-      memcpy(chreResult, &chppEvent->payload,
-             sizeof(struct ChppGnssLocationEvent));
-      gCallbacks->locationEventCallback(chreResult);
-    }
+    gCallbacks->locationEventCallback(chre);
   }
 }
 
@@ -480,11 +475,24 @@
 static void chppGnssMeasurementResultNotification(
     struct ChppGnssClientState *clientContext, uint8_t *buf, size_t len) {
   UNUSED_VAR(clientContext);
-  UNUSED_VAR(buf);
-  UNUSED_VAR(len);
-  // TODO: Use parser script, i.e. chppGnssMeasurementEventToChre(), to convert
+  CHPP_LOGD(
+      "chppGnssMeasurementResultNotification received data len=%" PRIuSIZE,
+      len);
 
-  // gCallbacks->measurementEventCallback(chreResult);
+  buf += sizeof(struct ChppAppHeader);
+  len -= sizeof(struct ChppAppHeader);
+
+  struct chreGnssDataEvent *chre =
+      chppGnssDataEventToChre((struct ChppGnssDataEvent *)buf, len);
+
+  if (chre == NULL) {
+    CHPP_LOGE(
+        "chppGnssMeasurementResultNotification CHPP -> CHRE conversion failed. "
+        "Input len=%" PRIuSIZE,
+        len);
+  } else {
+    gCallbacks->measurementEventCallback(chre);
+  }
 }
 
 /**