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

Commit 7cb70276 authored by Narayan Kamath's avatar Narayan Kamath Committed by Gerrit Code Review
Browse files

Merge "Various fixes for LP64"

parents a5dde392 02f63442

Android.mk

+4 −2
Original line number Diff line number Diff line 
LOCAL_PATH := $(call my-dir)



bdroid_CFLAGS := -Wno-unused-parameter



# Setup bdroid local make variables for handling configuration

ifneq ($(BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR),)

  bdroid_C_INCLUDES := $(BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR)

  bdroid_CFLAGS := -DHAS_BDROID_BUILDCFG

  bdroid_CFLAGS += -DHAS_BDROID_BUILDCFG

else

  bdroid_C_INCLUDES :=

  bdroid_CFLAGS := -DHAS_NO_BDROID_BUILDCFG

  bdroid_CFLAGS += -DHAS_NO_BDROID_BUILDCFG

endif



include $(call all-subdir-makefiles)

system/audio_a2dp_hw/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ LOCAL_SRC_FILES:= \ 
	audio_a2dp_hw.c



LOCAL_C_INCLUDES+= .

LOCAL_CFLAGS := -Wno-unused-parameter



LOCAL_SHARED_LIBRARIES := \

	libcutils liblog

system/audio_a2dp_hw/audio_a2dp_hw.c

+1 −1
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ static int skt_connect(struct a2dp_stream_out *out, char *path) 
    struct sockaddr_un remote;

    int len;



    INFO("connect to %s (sz %d)", path, out->buffer_sz);

    INFO("connect to %s (sz %zu)", path, out->buffer_sz);



    skt_fd = socket(AF_LOCAL, SOCK_STREAM, 0);

system/bta/dm/bta_dm_act.c

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
#include "l2c_api.h"

#include "wbt_api.h"

#include "utl.h"

#include "gap_api.h"    /* For GAP_BleReadPeerPrefConnParams */

#include <string.h>



static void bta_dm_inq_results_cb (tBTM_INQ_RESULTS *p_inq, UINT8 *p_eir);

system/bta/jv/bta_jv_act.c

+9 −9
Original line number Diff line number Diff line
@@ -285,8 +285,8 @@ static tBTA_JV_STATUS bta_jv_free_rfc_cb(tBTA_JV_RFC_CB *p_cb, tBTA_JV_PCB *p_pc 
        return BTA_JV_FAILURE;

    }

    APPL_TRACE_DEBUG6("bta_jv_free_sr_rfc_cb: max_sess:%d, curr_sess:%d, p_pcb:%p, user:"

            "%d, state:%d, jv handle: 0x%x" ,p_cb->max_sess, p_cb->curr_sess, p_pcb,

            (int)p_pcb->user_data, p_pcb->state, p_pcb->handle);

            "%p, state:%d, jv handle: 0x%x" ,p_cb->max_sess, p_cb->curr_sess, p_pcb,

            p_pcb->user_data, p_pcb->state, p_pcb->handle);



    if (p_cb->curr_sess <= 0)

        return BTA_JV_SUCCESS;
@@ -296,32 +296,32 @@ static tBTA_JV_STATUS bta_jv_free_rfc_cb(tBTA_JV_RFC_CB *p_cb, tBTA_JV_PCB *p_pc 
    case BTA_JV_ST_CL_CLOSING:

    case BTA_JV_ST_SR_CLOSING:

        APPL_TRACE_WARNING4("bta_jv_free_sr_rfc_cb: return on closing, port state:%d, "

                "scn:%d, p_pcb:%p, user_data:%d", p_pcb->state, p_cb->scn, p_pcb,

                (int)p_pcb->user_data);

                "scn:%d, p_pcb:%p, user_data:%p", p_pcb->state, p_cb->scn, p_pcb,

                p_pcb->user_data);

        status = BTA_JV_FAILURE;

        return status;

    case BTA_JV_ST_CL_OPEN:

    case BTA_JV_ST_CL_OPENING:

        APPL_TRACE_DEBUG3("bta_jv_free_sr_rfc_cb: state: %d, scn:%d,"

                          " user_data:%d", p_pcb->state, p_cb->scn, (int)p_pcb->user_data);

                          " user_data:%p", p_pcb->state, p_cb->scn, p_pcb->user_data);

        p_pcb->state = BTA_JV_ST_CL_CLOSING;

        break;

    case BTA_JV_ST_SR_LISTEN:

        p_pcb->state = BTA_JV_ST_SR_CLOSING;

        remove_server = TRUE;

        APPL_TRACE_DEBUG2("bta_jv_free_sr_rfc_cb: state: BTA_JV_ST_SR_LISTEN, scn:%d,"

                " user_data:%d", p_cb->scn, (int)p_pcb->user_data);

                " user_data:%p", p_cb->scn, p_pcb->user_data);

        break;

    case BTA_JV_ST_SR_OPEN:

        p_pcb->state = BTA_JV_ST_SR_CLOSING;

        APPL_TRACE_DEBUG2("bta_jv_free_sr_rfc_cb: state: BTA_JV_ST_SR_OPEN, scn:%d,"

                " user_data:%d", p_cb->scn, (int)p_pcb->user_data);

                " user_data:%p", p_cb->scn, p_pcb->user_data);

        break;

    default:

        APPL_TRACE_WARNING6("bta_jv_free_sr_rfc_cb():failed, ignore port state:%d, scn:"

                "%d, p_pcb:%p, jv handle: 0x%x, port_handle: %d, user_data:%d",

                "%d, p_pcb:%p, jv handle: 0x%x, port_handle: %d, user_data:%p",

                p_pcb->state, p_cb->scn, p_pcb, p_pcb->handle, p_pcb->port_handle,

                (int)p_pcb->user_data);

                p_pcb->user_data);

        status = BTA_JV_FAILURE;

        break;

    }