Merge "Revert "Cache NATIVE_WINDOW_MAX_BUFFER_COUNT in Surface""

                    static_cast<uint32_t>(mCore->mQueue.size());

            output->nextFrameNumber = mCore->mFrameCounter + 1;

            output->bufferReplaced = false;

            output->maxBufferCount = mCore->mMaxBufferCount;

            if (listener != nullptr) {

                // Set up a death notification so that we can disconnect

    mConnectedToCpu = false;

    mProducerControlledByApp = controlledByApp;

    mSwapIntervalZero = false;

    mMaxBufferCount = 0;

}

Surface::~Surface() {

                *value = static_cast<int>(mDataSpace);

                return NO_ERROR;

            }

            case NATIVE_WINDOW_MAX_BUFFER_COUNT: {

                *value = mMaxBufferCount;

                return NO_ERROR;

            }

        }

    }

    return mGraphicBufferProducer->query(what, value);

        mDefaultWidth = output.width;

        mDefaultHeight = output.height;

        mNextFrameNumber = output.nextFrameNumber;

        mMaxBufferCount = output.maxBufferCount;

        // Ignore transform hint if sticky transform is set or transform to display inverse flag is

        // set. Transform hint should be ignored if the client is expected to always submit buffers

        uint64_t nextFrameNumber{0};

        FrameEventHistoryDelta frameTimestamps;

        bool bufferReplaced{false};

        int maxBufferCount{0};

    };

    virtual status_t queueBuffer(int slot, const QueueBufferInput& input,

    bool mReportRemovedBuffers = false;

    std::vector<sp<GraphicBuffer>> mRemovedBuffers;

    int mMaxBufferCount;

};

} // namespace android