commit ad74480d6d9b15878bb14701aa81e73f86f70c75
author Ian Elliott <ianelliott@google.com> Wed Jul 26 21:46:43 2017 +0000
committer Ian Elliott <ianelliott@google.com> Wed Jul 26 21:46:43 2017 +0000
tree ce5b9c9f173181c9b45ec7a108bb3938adfc29bb
parent b4f7493fbdb1d9d5b437a1dcb82e98b1531f4e3e

Revert "Have the Surface class track the buffer age."

This reverts commit b4f7493fbdb1d9d5b437a1dcb82e98b1531f4e3e.

Change-Id: I9a783c8e768637bd73ac53a856e5f42703dcd82b

libs/gui/bufferqueue/1.0/H2BGraphicBufferProducer.cpp

diff --git a/libs/gui/bufferqueue/1.0/H2BGraphicBufferProducer.cpp b/libs/gui/bufferqueue/1.0/H2BGraphicBufferProducer.cpp
index 4a023a6..7c0552e 100644
--- a/libs/gui/bufferqueue/1.0/H2BGraphicBufferProducer.cpp
+++ b/libs/gui/bufferqueue/1.0/H2BGraphicBufferProducer.cpp
@@ -989,10 +989,10 @@
 }
 
 // FIXME: usage bits truncated -- needs a 64-bits usage version
-status_t H2BGraphicBufferProducer::dequeueBuffer(int* slot, sp<Fence>* fence, uint32_t w,
-                                                 uint32_t h, ::android::PixelFormat format,
-                                                 uint64_t usage, uint64_t* outBufferAge,
-                                                 FrameEventHistoryDelta* outTimestamps) {
+status_t H2BGraphicBufferProducer::dequeueBuffer(
+        int* slot, sp<Fence>* fence,
+        uint32_t w, uint32_t h, ::android::PixelFormat format,
+        uint64_t usage, FrameEventHistoryDelta* outTimestamps) {
     *fence = new Fence();
     status_t fnStatus;
     status_t transStatus = toStatusT(mBase->dequeueBuffer(
@@ -1016,10 +1016,6 @@
                     fnStatus = fnStatus == NO_ERROR ? BAD_VALUE : fnStatus;
                 }
             }));
-    if (outBufferAge) {
-        // Since the HAL version doesn't return the buffer age, set it to 0:
-        *outBufferAge = 0;
-    }
     return transStatus == NO_ERROR ? fnStatus : transStatus;
 }