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

Commit ec725fba authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of [17302473] into tm-release. 

Change-Id: Ied50963a91d263ea1cc6fc9ccb6e6c20be813089
parents da21612b d7a694c6

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 {