Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ashutosh Joshi
2016-04-01 19:55:16 +00:00
committed by Android (Google) Code Review
parent 5a8992700c 85e093bc03
commit 0dac5f2ad1
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/jni/android_hardware_location_ContextHubService.cpp
View File

@@ -216,7 +216,7 @@ int add_app_instance(const hub_app_info *appInfo, uint32_t hubHandle, JNIEnv *en
int appInstanceHandle = generate_id(); int appInstanceHandle = generate_id();
if (appInstanceHandle < 0 || !appName || !entry || !name) { 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); appInstanceHandle, appName, entry);
free(appName); free(appName);
@@ -360,8 +360,7 @@ int handle_query_apps_response(char *msg, int msgLen, uint32_t hubHandle) {
memcpy(info, msg, msgLen); memcpy(info, msg, msgLen);
for (i = 0; i < numApps; i++) { for (i = 0; i < numApps; i++) {
add_app_instance(info, hubHandle, env); add_app_instance(&info[i], hubHandle, env);
info++;
} }
free(info); free(info);
@@ -438,7 +437,7 @@ int context_hub_callback(uint32_t hubId,
msgHeader[HEADER_FIELD_MSG_TYPE] = msg->message_type; msgHeader[HEADER_FIELD_MSG_TYPE] = msg->message_type;
if (!sanity_check_cookie(cookie, hubId)) { if (!sanity_check_cookie(cookie, hubId)) {
ALOGW("Incorrect cookie %" PRId32 " for cookie %lu! Bailing", ALOGW("Incorrect cookie %" PRId32 " for cookie %p! Bailing",
hubId, cookie); hubId, cookie);
return -1; return -1;