Merge "Fix crash in smp_br_state_machine_event" into rvc-qpr-dev (385eee4c) · Commits · e / os / android_packages_modules_Bluetooth

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,