Merge "GraphicsTracker: handle dequeueBuffer error while switching Surfaces" into main

            ALOGW("BQ might not be ready for dequeueBuffer()");

            return C2_BLOCKING;

        }

        bool cacheExpired = false;

        {

            std::unique_lock<std::mutex> l(mLock);

            cacheExpired = (mBufferCache.get() != cache.get());

        }

        if (cacheExpired) {

            ALOGW("a new BQ is configured. dequeueBuffer() error %d", (int)status);

            return C2_BLOCKING;

        }

        ALOGE("BQ in inconsistent status. dequeueBuffer() error %d", (int)status);

        return C2_CORRUPTED;

    }