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

Commit d7a827fa authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6859016 from 385eee4c to rvc-qpr1-release 

Change-Id: I5a66cb27d949d195b22848d20bc1d825cf87b5a4
parents 563f2dd9 385eee4c

system/stack/avrc/avrc_pars_tg.cc

+2 −0
Original line number Diff line number Diff line
@@ -71,6 +71,8 @@ static tAVRC_STS avrc_ctrl_pars_vendor_cmd(tAVRC_MSG_VENDOR* p_msg, 
      break;

    }

    case AVRC_PDU_REGISTER_NOTIFICATION: /* 0x31 */

      if (len < 5) return AVRC_STS_INTERNAL_ERR;



      BE_STREAM_TO_UINT8(p_result->reg_notif.event_id, p);

      BE_STREAM_TO_UINT32(p_result->reg_notif.param, p);

      break;

system/stack/smp/smp_br_main.cc

+2 −1
Original line number Diff line number Diff line
@@ -303,7 +303,6 @@ void smp_br_state_machine_event(tSMP_CB* p_cb, tSMP_BR_EVENT event, 
  tSMP_BR_STATE curr_state = p_cb->br_state;

  tSMP_BR_SM_TBL state_table;

  uint8_t action, entry;

  tSMP_BR_ENTRY_TBL entry_table = smp_br_entry_table[p_cb->role];



  SMP_TRACE_EVENT("main %s", __func__);

  if (curr_state >= SMP_BR_STATE_MAX) {
@@ -317,6 +316,8 @@ void smp_br_state_machine_event(tSMP_CB* p_cb, tSMP_BR_EVENT event, 
    return;

  }



  tSMP_BR_ENTRY_TBL entry_table = smp_br_entry_table[p_cb->role];



  SMP_TRACE_DEBUG("SMP Role: %s State: [%s (%d)], Event: [%s (%d)]",

                  (p_cb->role == HCI_ROLE_SLAVE) ? "Slave" : "Master",

                  smp_get_br_state_name(p_cb->br_state), p_cb->br_state,