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

Commit d2cc4273 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 24825 into eclair 

* changes:
  fix [2111536] [FAST BLOCKER] Device is soft rebooted after ending the call through voice dialer
parents f376c837 3e63f917

libs/ui/SharedBufferStack.cpp

+22 −3
Original line number Original line Diff line number Diff line
@@ -246,10 +246,30 @@ SharedBufferClient::SharedBufferClient(SharedClient* sharedClient, 
        int surface, int num)

        int surface, int num)

    : SharedBufferBase(sharedClient, surface, num), tail(0)

    : SharedBufferBase(sharedClient, surface, num), tail(0)

{

{

    SharedBufferStack& stack( *mSharedStack );

    int32_t avail;

    int32_t head;

    // we need to make sure we read available and head coherently,

    // w.r.t RetireUpdate.

    do {

        avail = stack.available;

        head = stack.head;

    } while (stack.available != avail);

    tail = head - avail + 1;

    if (tail < 0) {

        tail += num;

    }

}

}





ssize_t SharedBufferClient::dequeue()

ssize_t SharedBufferClient::dequeue()

{

{

    SharedBufferStack& stack( *mSharedStack );



    if (stack.head == tail && stack.available == 2) {

        LOGW("dequeue: tail=%d, head=%d, avail=%d, queued=%d",

                tail, stack.head, stack.available, stack.queued);

    }



    //LOGD("[%d] about to dequeue a buffer",

    //LOGD("[%d] about to dequeue a buffer",

    //        mSharedStack->identity);

    //        mSharedStack->identity);

    DequeueCondition condition(this);

    DequeueCondition condition(this);
@@ -257,8 +277,6 @@ ssize_t SharedBufferClient::dequeue() 
    if (err != NO_ERROR)

    if (err != NO_ERROR)

        return ssize_t(err);

        return ssize_t(err);







    SharedBufferStack& stack( *mSharedStack );

    // NOTE: 'stack.available' is part of the conditions, however

    // NOTE: 'stack.available' is part of the conditions, however

    // decrementing it, never changes any conditions, so we don't need

    // decrementing it, never changes any conditions, so we don't need

    // to do this as part of an update.

    // to do this as part of an update.
@@ -270,6 +288,7 @@ ssize_t SharedBufferClient::dequeue() 
    tail = ((tail+1 >= mNumBuffers) ? 0 : tail+1);

    tail = ((tail+1 >= mNumBuffers) ? 0 : tail+1);

    LOGD_IF(DEBUG_ATOMICS, "dequeued=%d, tail=%d, %s",

    LOGD_IF(DEBUG_ATOMICS, "dequeued=%d, tail=%d, %s",

            dequeued, tail, dump("").string());

            dequeued, tail, dump("").string());



    return dequeued;

    return dequeued;

}

}
@@ -326,7 +345,7 @@ ssize_t SharedBufferServer::retireAndLock() 
{

{

    RetireUpdate update(this, mNumBuffers);

    RetireUpdate update(this, mNumBuffers);

    ssize_t buf = updateCondition( update );

    ssize_t buf = updateCondition( update );

    LOGD_IF(DEBUG_ATOMICS, "retire=%d, %s", int(buf), dump("").string());

    LOGD_IF(DEBUG_ATOMICS && buf>=0, "retire=%d, %s", int(buf), dump("").string());

    return buf;

    return buf;

}

}