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

Commit ca83b177 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "am-052c6ecb-b5c1-4a10-9d60-0251d0e6f8d6" into nyc-mr1-dev 

* changes:
  [automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am: e71e7649 am: fa02e30d
  [automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am: e71e7649
  DO NOT MERGE Fix unexpected behavior in smp_sm_event
parents 99aa0b12 e01d125d

system/stack/smp/smp_main.c

+8 −0
Original line number Original line Diff line number Diff line
@@ -20,6 +20,7 @@ 




#if SMP_INCLUDED == TRUE

#if SMP_INCLUDED == TRUE





#include <cutils/log.h>

#include <string.h>

#include <string.h>

#include "smp_int.h"

#include "smp_int.h"
@@ -770,6 +771,13 @@ void smp_sm_event(tSMP_CB *p_cb, tSMP_EVENT event, void *p_data) 
    UINT8           curr_state = p_cb->state;

    UINT8           curr_state = p_cb->state;

    tSMP_SM_TBL     state_table;

    tSMP_SM_TBL     state_table;

    UINT8           action, entry, i;

    UINT8           action, entry, i;



    if (p_cb->role >= 2) {

        SMP_TRACE_DEBUG("Invalid role: %d", p_cb->role);

        android_errorWriteLog(0x534e4554, "74121126");

        return;

    }



    tSMP_ENTRY_TBL  entry_table =  smp_entry_table[p_cb->role];

    tSMP_ENTRY_TBL  entry_table =  smp_entry_table[p_cb->role];





    SMP_TRACE_EVENT("main smp_sm_event");

    SMP_TRACE_EVENT("main smp_sm_event");