commit befd33975c2f57a541b62668e4d9976e149db73b
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Apr 17 18:51:43 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 17 18:51:49 2017 +0000
tree 6512c22a5bb804e57d76fa7123deff6e121aa160
parent d8d7a283bdf848c5ffa0a588704531eda4266fae
parent 0e5a2ab7c3ae3d798072fec0dd8407c50c862515

Merge "ContextHubService: Pass on query requests" into oc-dev

services/core/jni/com_android_server_location_ContextHubService.cpp

diff --git a/services/core/jni/com_android_server_location_ContextHubService.cpp b/services/core/jni/com_android_server_location_ContextHubService.cpp
index d834e25..20466eb 100644
--- a/services/core/jni/com_android_server_location_ContextHubService.cpp
+++ b/services/core/jni/com_android_server_location_ContextHubService.cpp
@@ -1129,6 +1129,8 @@
         if (appInstanceHandle == OS_APP_ID) {
             if (msgType == CONTEXT_HUB_LOAD_APP) {
                 result = sendLoadNanoAppRequest(hubId, data, dataBufferLength);
+            } else if (msgType == CONTEXT_HUB_QUERY_APPS) {
+                result = db.hubInfo.contextHub->queryApps(hubId);
             } else {
                 ALOGD("Dropping OS addresses message of type - %" PRIu32, msgType);
                 result = Result::BAD_PARAMS;