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

Commit cf3de592 authored by Scott James Remnant's avatar Scott James Remnant
Browse files

Resolve merge resolution differences between branches 

Change-Id: I7b2f5bcf3a43aacdfbb740589ca1538ade149473
parent ce234061

system/audio_a2dp_hw/audio_a2dp_hw.c

+0 −1
Original line number Diff line number Diff line
@@ -698,7 +698,6 @@ static int out_set_parameters(struct audio_stream *stream, const char *kvpairs) 


    INFO("state %d", out->common.state);





    hash_map_t *params = hash_map_utils_new_from_string_params(kvpairs);

    int status = 0;

system/btif/src/btif_pan.c

+1 −2
Original line number Diff line number Diff line
@@ -689,9 +689,8 @@ static void bta_pan_callback_transfer(UINT16 event, char *p_param) 
            }

        case BTA_PAN_CLOSE_EVT:

            {

                btpan_conn_t* conn = btpan_find_conn_handle(p_data->close.handle);



                LOG_INFO(LOG_TAG, "%s: event = BTA_PAN_CLOSE_EVT handle %d", __FUNCTION__, p_data->close.handle);

                btpan_conn_t* conn = btpan_find_conn_handle(p_data->close.handle);

                btpan_close_conn(conn);



                if (conn && conn->handle >= 0)

system/osi/src/alarm.c

+2 −1
Original line number Diff line number Diff line
@@ -227,7 +227,8 @@ static bool lazy_initialize(void) { 
  sigevent.sigev_notify = SIGEV_THREAD;

  sigevent.sigev_notify_function = (void (*)(union sigval))timer_callback;

  if (timer_create(CLOCK_ID, &sigevent, &timer) == -1) {

    LOG_ERROR(LOG_TAG, "%s unable to create timer: %s", __func__, strerror(errno));

    LOG_ERROR(LOG_TAG, "%s unable to create timer: %s", __func__,

              strerror(errno));

    return false;

  }