| commit | 37613782b316c2ee0969039699320d004b5d0786 | [log] [tgz] |
|---|---|---|
| author | Alec Mouri <alecmouri@google.com> | Tue Aug 11 23:48:45 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 11 23:48:45 2020 +0000 |
| tree | 66aab46f9f2b9d42f270963935b2748f2fb133fe | |
| parent | 2c8849612e045c8a874ffb843353d2dbcbf79496 [diff] | |
| parent | d3f29a6590a2859203c7f2bd82e366c4dddb4323 [diff] |
Merge "Add back in mBufferId to GraphicBuffer ABI." into rvc-dev-plus-aosp am: 764870d336 am: d3f29a6590 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/12328560 Change-Id: I6db32035b84a73b1ab3b795553d7b8a0981e8abe
diff --git a/libs/ui/include/ui/GraphicBuffer.h b/libs/ui/include/ui/GraphicBuffer.h index 013505a..57be686 100644 --- a/libs/ui/include/ui/GraphicBuffer.h +++ b/libs/ui/include/ui/GraphicBuffer.h
@@ -260,6 +260,9 @@ uint64_t mId; + // Unused, but removing this may break GSI. + int32_t mBufferId = -1; + // Stores the generation number of this buffer. If this number does not // match the BufferQueue's internal generation number (set through // IGBP::setGenerationNumber), attempts to attach the buffer will fail.