Merge "Fix PatchTrack retry for ClientProxy::obtainBuffer" into pi-dev

    status_t status = NO_ERROR;

    static const int32_t kMaxTries = 5;

    int32_t tryCounter = kMaxTries;

    const size_t originalFrameCount = buffer->mFrameCount;

    do {

        if (status == NOT_ENOUGH_DATA) {

            restartIfDisabled();

            buffer->mFrameCount = originalFrameCount; // cleared on error, must be restored.

        }

        status = mProxy->obtainBuffer(buffer, timeOut);

    } while ((status == NOT_ENOUGH_DATA) && (tryCounter-- > 0));