Merge "Use CacheId when buffer is null." into tm-dev (c4727894) · Commits · e / os / platform_frameworks_native

libs/gui/LayerState.cpp

+7 −1

Original line number	Diff line number	Diff line
		@@ -774,7 +774,13 @@ status_t LayerCaptureArgs::readFromParcel(const Parcel* input) {
		}; // namespace gui

		ReleaseCallbackId BufferData::generateReleaseCallbackId() const {
		return {buffer->getId(), frameNumber};
		uint64_t bufferId;
		if (buffer) {
		bufferId = buffer->getId();
		} else {
		bufferId = cachedBuffer.id;
		}
		return {bufferId, frameNumber};
		}

		status_t BufferData::writeToParcel(Parcel* output) const {