commit 74074f158a4535d34bfd845240c00f12e13cb614
author Ian Elliott <ianelliott@google.com> Wed Jul 26 21:54:47 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jul 26 21:54:47 2017 +0000
tree 98bbc8d7eaafbd40381697c764e14dcc39ed37a2
parent 56954aa36e7a81217624e58e195f357404759237
parent ad74480d6d9b15878bb14701aa81e73f86f70c75

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

libs/sensor/Sensor.cpp

diff --git a/libs/sensor/Sensor.cpp b/libs/sensor/Sensor.cpp
index 0a537a3..a0e368c 100644
--- a/libs/sensor/Sensor.cpp
+++ b/libs/sensor/Sensor.cpp
@@ -38,7 +38,8 @@
         Sensor(*hwSensor, uuid_t(), halVersion) {
 }
 
-Sensor::Sensor(struct sensor_t const& hwSensor, const uuid_t& uuid, int halVersion) {
+Sensor::Sensor(struct sensor_t const& hwSensor, const uuid_t& uuid, int halVersion) :
+        Sensor("") {
     mName = hwSensor.name;
     mVendor = hwSensor.vendor;
     mVersion = hwSensor.version;

services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp

diff --git a/services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp b/services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp
index 05e9c2d..ccb0c3b 100644
--- a/services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp
+++ b/services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp
@@ -174,17 +174,16 @@
 #ifdef USE_HWC2
     mHwcBufferCache.getHwcBuffer(mCurrentBufferSlot, mCurrentBuffer,
             &outSlot, &outBuffer);
-    outDataspace = item.mDataSpace;
-#else
-    outBuffer = mCurrentBuffer;
-#endif
     status_t result =
             mHwc.setClientTarget(mDisplayType, outSlot, outFence, outBuffer, outDataspace);
     if (result != NO_ERROR) {
         ALOGE("error posting framebuffer: %d", result);
+        return result;
     }
-
-    return result;
+#else
+    outBuffer = mCurrentBuffer;
+#endif
+    return NO_ERROR;
 }
 
 #ifndef USE_HWC2