commit aaa58d0c1af6d4e8304dedd0b5edfde014cff5b4
author Brian Duddie <bduddie@google.com> Mon Apr 17 21:46:51 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Apr 17 21:46:51 2017 +0000
tree 38611fd7e5c81dc52e4efc23bc85e93a85b2e219
parent 79606abc48150ae9c405c7c5aa38268f3c0a02d6
parent 2f23a1a7a1d595d375dd8afd753f28390708c258

Merge "ContextHubService: Pass on query requests" into oc-dev am: befd33975c
am: 2f23a1a7a1

Change-Id: I3392ad2be1113bf69381e0c7f108bb9ca1a59492

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;