From 28df640ff4754900aa5f5d6d351d2697fe161f11 Mon Sep 17 00:00:00 2001
From: Arthur Ishiguro <arthuri@google.com>
Date: Wed, 8 Nov 2017 17:45:19 -0800
Subject: [PATCH] Creates a dummy pointer for empty messages

Changes to Java HIDL at ContextHubService caused empty messages with
sendMessageToHub to be populated with null pointers. Work around this by
creating a dummy pointer in this case.

Bug: 69065562
Test: Compile on sailfish-userdebug, run CHQTS and verify pass
Change-Id: I763cbf9696f6dc04637add3ed1da01f9c32d458b
---
 contexthub/1.0/default/Contexthub.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/contexthub/1.0/default/Contexthub.cpp b/contexthub/1.0/default/Contexthub.cpp
index 3626a0948f..8d10c75121 100644
--- a/contexthub/1.0/default/Contexthub.cpp
+++ b/contexthub/1.0/default/Contexthub.cpp
@@ -155,6 +155,12 @@ Return<Result> Contexthub::sendMessageToHub(uint32_t hubId,
         .message = static_cast<const uint8_t *>(msg.msg.data()),
     };
 
+    // Use a dummy to prevent send_message with empty message from failing prematurely
+    static uint8_t dummy;
+    if (txMsg.message_len == 0 && txMsg.message == nullptr) {
+        txMsg.message = &dummy;
+    }
+
     ALOGI("Sending msg of type %" PRIu32 ", size %" PRIu32 " to app 0x%" PRIx64,
           txMsg.message_type,
           txMsg.message_len,