commit 170611dcf1990464c567a854a224aa9e321b368c
author Arthur Ishiguro <arthuri@google.com> Fri Nov 17 10:02:17 2017 -0800
committer Arthur Ishiguro <arthuri@google.com> Mon Nov 20 09:00:00 2017 -0800
tree 06dcba0e0219c944b6f8170f282b36810b40a024
parent 6cc8d47c9c67807d0b3065a1da6e02e7712d4d74

Creates utility functions to convert between messages

Will be needed to convert between client-facing and HIDL messages
to/from nanoapps.

Bug: 67734082
Test: make from root
Change-Id: Id0ece7600a653a0ede6d92d9ebbe8dfdc3489207

services/core/java/com/android/server/location/ContextHubServiceUtil.java

diff --git a/services/core/java/com/android/server/location/ContextHubServiceUtil.java b/services/core/java/com/android/server/location/ContextHubServiceUtil.java
index 568d027..ddbaf86 100644
--- a/services/core/java/com/android/server/location/ContextHubServiceUtil.java
+++ b/services/core/java/com/android/server/location/ContextHubServiceUtil.java
@@ -17,9 +17,12 @@
 package com.android.server.location;
 
 import android.hardware.contexthub.V1_0.ContextHub;
+import android.hardware.contexthub.V1_0.ContextHubMsg;
+import android.hardware.contexthub.V1_0.HostEndPoint;
 import android.hardware.contexthub.V1_0.HubAppInfo;
 import android.hardware.location.ContextHubInfo;
 import android.hardware.location.NanoAppBinary;
+import android.hardware.location.NanoAppMessage;
 import android.hardware.location.NanoAppState;
 import android.util.Log;
 
@@ -128,4 +131,38 @@
 
         return nanoAppStateList;
     }
+
+    /**
+     * Creates a HIDL ContextHubMsg object to send to a nanoapp.
+     *
+     * @param hostEndPoint the ID of the client sending the message
+     * @param message      the client-facing NanoAppMessage object describing the message
+     * @return the HIDL ContextHubMsg object
+     */
+    /* package */
+    static ContextHubMsg createHidlContextHubMessage(short hostEndPoint, NanoAppMessage message) {
+        ContextHubMsg hidlMessage = new ContextHubMsg();
+
+        hidlMessage.appName = message.getNanoAppId();
+        hidlMessage.hostEndPoint = hostEndPoint;
+        hidlMessage.msgType = message.getMessageType();
+        copyToByteArrayList(message.getMessageBody(), hidlMessage.msg);
+
+        return hidlMessage;
+    }
+
+    /**
+     * Creates a client-facing NanoAppMessage object to send to a client.
+     *
+     * @param message the HIDL ContextHubMsg object from a nanoapp
+     * @return the NanoAppMessage object
+     */
+    /* package */
+    static NanoAppMessage createNanoAppMessage(ContextHubMsg message) {
+        byte[] messageArray = createPrimitiveByteArray(message.msg);
+
+        return NanoAppMessage.createMessageFromNanoApp(
+                message.appName, message.msgType, messageArray,
+                message.hostEndPoint == HostEndPoint.BROADCAST);
+    }
 }