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

Commit 2024f1a5 authored by Andre Eisenbach's avatar Andre Eisenbach Committed by Android (Google) Code Review
Browse files

Merge "Fix error in tick calculation when timer is removed" into lmp-dev

parents c3a86422 c4c0d690

gki/common/gki_time.c

+3 −3
Original line number Diff line number Diff line
@@ -704,9 +704,6 @@ BOOLEAN GKI_remove_from_timer_list (TIMER_LIST_Q *p_timer_listq, TIMER_LIST_ENT 
    if (p_tle == NULL || p_timer_listq->p_first == NULL)

        return FALSE;



    p_tle->ticks = 0;

    p_tle->in_use = FALSE;



    /* Add the ticks remaining in this timer (if any) to the next guy in the list.

    ** Note: Expired timers have a tick value of '0'.

    */
@@ -715,6 +712,9 @@ BOOLEAN GKI_remove_from_timer_list (TIMER_LIST_Q *p_timer_listq, TIMER_LIST_ENT 
        p_tle->p_next->ticks += p_tle->ticks;

    }



    p_tle->ticks = 0;

    p_tle->in_use = FALSE;



    /* Unlink timer from the list.

    */

    if (p_timer_listq->p_first == p_tle)