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

Commit 7be5851a authored by Ashutosh Joshi's avatar Ashutosh Joshi Committed by android-build-merger
Browse files

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

am: 439a298b

* commit '439a298b':
  Revert "Ensuring builds compile for both 32 bit and 64 bit targets."

Change-Id: I5fba1daa12e65f742176b62326227ded0130dbab
parents b02fc799 439a298b

core/jni/android_hardware_location_ContextHubService.cpp

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



    if (appInstanceHandle < 0 || !appName || !entry || !name) {

        ALOGE("Cannot find resources to add app instance %d, %p, %p",

        ALOGE("Cannot find resources to add app instance %d, %d, %d",

            appInstanceHandle, appName, entry);



        free(appName);
@@ -360,7 +360,8 @@ int handle_query_apps_response(char *msg, int msgLen, uint32_t hubHandle) { 


    memcpy(info, msg, msgLen);

    for (i = 0; i < numApps; i++) {

        add_app_instance(&info[i], hubHandle, env);

        add_app_instance(info, hubHandle, env);

        info++;

    }



    free(info);
@@ -437,7 +438,7 @@ int context_hub_callback(uint32_t hubId, 
    msgHeader[HEADER_FIELD_MSG_TYPE] = msg->message_type;



    if (!sanity_check_cookie(cookie, hubId)) {

        ALOGW("Incorrect cookie %" PRId32 " for cookie %p! Bailing",

        ALOGW("Incorrect cookie %" PRId32 " for cookie %lu! Bailing",

              hubId, cookie);



        return -1;