commit 7b6c15f85d3b3d23b7c8d3915579c069c9599868
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Aug 28 02:27:50 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 28 02:27:50 2019 +0000
tree 1cf21cab1e6ee4f5dbd0ce86faad59fb342da18e
parent 3bf71ab81e1ff56520ce3e8d8eb901e5b360e245
parent baa35b0e2f71a3ca2bb2fbb3f71b1f7cf4447bdd

Merge changes from topic "b:140112642:1" into qt-surfaceflinger-dev

* changes:
  SurfaceFlinger: do not force HDR content to default refresh rate
  [SurfaceFlinger] fix permanently enabling early offsets.
  [SurfaceFlinger] Some dispsync fixes for early event firing
  [SurfaceFlinger] add minimum frame count for early gl offsets.

libs/gui/Surface.cpp

diff --git a/libs/gui/Surface.cpp b/libs/gui/Surface.cpp
index e6eb327..9fe5de8 100644
--- a/libs/gui/Surface.cpp
+++ b/libs/gui/Surface.cpp
@@ -1920,7 +1920,8 @@
     return OK;
 }
 
-status_t Surface::attachAndQueueBuffer(Surface* surface, sp<GraphicBuffer> buffer) {
+status_t Surface::attachAndQueueBufferWithDataspace(Surface* surface, sp<GraphicBuffer> buffer,
+                                                    Dataspace dataspace) {
     if (buffer == nullptr) {
         return BAD_VALUE;
     }
@@ -1929,6 +1930,11 @@
     if (err != OK) {
         return err;
     }
+    ui::Dataspace tmpDataspace = surface->getBuffersDataSpace();
+    err = surface->setBuffersDataSpace(dataspace);
+    if (err != OK) {
+        return err;
+    }
     err = surface->attachBuffer(buffer->getNativeBuffer());
     if (err != OK) {
         return err;
@@ -1937,6 +1943,10 @@
     if (err != OK) {
         return err;
     }
+    err = surface->setBuffersDataSpace(tmpDataspace);
+    if (err != OK) {
+        return err;
+    }
     err = surface->disconnect(NATIVE_WINDOW_API_CPU);
     return err;
 }

libs/gui/include/gui/Surface.h

diff --git a/libs/gui/include/gui/Surface.h b/libs/gui/include/gui/Surface.h
index 0c471bb..5c6a1ee 100644
--- a/libs/gui/include/gui/Surface.h
+++ b/libs/gui/include/gui/Surface.h
@@ -292,7 +292,8 @@
 
     ui::Dataspace getBuffersDataSpace();
 
-    static status_t attachAndQueueBuffer(Surface* surface, sp<GraphicBuffer> buffer);
+    static status_t attachAndQueueBufferWithDataspace(Surface* surface, sp<GraphicBuffer> buffer,
+                                                      ui::Dataspace dataspace);
 
 protected:
     enum { NUM_BUFFER_SLOTS = BufferQueueDefs::NUM_BUFFER_SLOTS };