Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc830108 authored by Rob Carr's avatar Rob Carr Committed by Automerger Merge Worker
Browse files

Merge "Use CacheId when buffer is null." into tm-dev am: c4727894 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/17302473

Change-Id: Icb104955fdd0c7fc8db78bfdbbdd66e30c2b3f84
parents a810a50a c4727894

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 {