commit 0dac5f2ad1c5e4ffe2e11cb0cc1a1cb6c8dbc1dd
author Ashutosh Joshi <ashutoshj@google.com> Fri Apr 01 19:55:16 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 01 19:55:18 2016 +0000
tree 71fe68ba0c34615a5c94439c1805c8edb32c5bf0
parent 5a8992700cee8d61a378d95b7161c1dbe13065d5
parent 85e093bc03d747f69b3ada658c9e82f442cda334

Merge "Ensuring builds compile for both 32 bit and 64 bit targets." into nyc-dev

core/jni/android_hardware_location_ContextHubService.cpp

diff --git a/core/jni/android_hardware_location_ContextHubService.cpp b/core/jni/android_hardware_location_ContextHubService.cpp
index 8b476cf..d05f82e 100644
--- a/core/jni/android_hardware_location_ContextHubService.cpp
+++ b/core/jni/android_hardware_location_ContextHubService.cpp
@@ -216,7 +216,7 @@
     int appInstanceHandle = generate_id();
 
     if (appInstanceHandle < 0 || !appName || !entry || !name) {
-        ALOGE("Cannot find resources to add app instance %d, %d, %d",
+        ALOGE("Cannot find resources to add app instance %d, %p, %p",
             appInstanceHandle, appName, entry);
 
         free(appName);
@@ -360,8 +360,7 @@
 
     memcpy(info, msg, msgLen);
     for (i = 0; i < numApps; i++) {
-        add_app_instance(info, hubHandle, env);
-        info++;
+        add_app_instance(&info[i], hubHandle, env);
     }
 
     free(info);
@@ -438,7 +437,7 @@
     msgHeader[HEADER_FIELD_MSG_TYPE] = msg->message_type;
 
     if (!sanity_check_cookie(cookie, hubId)) {
-        ALOGW("Incorrect cookie %" PRId32 " for cookie %lu! Bailing",
+        ALOGW("Incorrect cookie %" PRId32 " for cookie %p! Bailing",
               hubId, cookie);
 
         return -1;