Merge "Move remaining bits of lockBuffer to dequeueBuffer"

    if (self->mBufferHead >= self->mNumBuffers)

        self->mBufferHead = 0;

    // wait for a free buffer

    while (!self->mNumFreeBuffers) {

    // wait for a free non-front buffer

    while (self->mNumFreeBuffers < 2) {

        self->mCondition.wait(self->mutex);

    }

    ALOG_ASSERT(self->buffers[index] != self->front);

    // get this buffer

    self->mNumFreeBuffers--;

    self->mCurrentBufferIndex = index;

int FramebufferNativeWindow::lockBuffer_DEPRECATED(ANativeWindow* window, 

        ANativeWindowBuffer* buffer)

{

    // XXX: Can this code all get ripped out?  Should it move to dequeueBuffer?

    FramebufferNativeWindow* self = getSelf(window);

    Mutex::Autolock _l(self->mutex);

    const int index = self->mCurrentBufferIndex;

    // wait that the buffer we're locking is not front anymore

    while (self->front == buffer) {

        self->mCondition.wait(self->mutex);

    }

    return NO_ERROR;

}