Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 85e093bc authored by Ashutosh Joshi's avatar Ashutosh Joshi
Browse files

Ensuring builds compile for both 32 bit and 64 bit targets. 

Fixing print formats for pointers.
Fixing a dangerous memory free.

Change-Id: I7c53bdaeceed80845ef002ed6a8a783ecb0378dc
parent dec4430d

core/jni/android_hardware_location_ContextHubService.cpp

+3 −4
Original line number Original line Diff line number Diff line
@@ -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;