commit af2fbb0ccce60dedecdf9f622dc5d2828eeeadbb
author Fabien Sanglard <sanglardf@google.com> Tue Oct 18 18:41:44 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 18 18:41:45 2016 +0000
tree 1cea84a33949736f976b87fe87cb0709a493a0f8
parent 0723ad396910043e66278b21e47d61fb2b7c0995
parent 0a4b26ecb6a9f772502c770fbe4c9fc661578cb7

Merge "Fix surfaceflinger file descriptor leak"

services/surfaceflinger/SurfaceFlingerConsumer.cpp

diff --git a/services/surfaceflinger/SurfaceFlingerConsumer.cpp b/services/surfaceflinger/SurfaceFlingerConsumer.cpp
index c71b3bc..edd53a3 100644
--- a/services/surfaceflinger/SurfaceFlingerConsumer.cpp
+++ b/services/surfaceflinger/SurfaceFlingerConsumer.cpp
@@ -69,6 +69,14 @@
         return err;
     }
 
+    if (autoRefresh) {
+        *autoRefresh = item.mAutoRefresh;
+    }
+
+    if (queuedBuffer) {
+        *queuedBuffer = item.mQueuedBuffer;
+    }
+
     // We call the rejecter here, in case the caller has a reason to
     // not accept this buffer.  This is used by SurfaceFlinger to
     // reject buffers which have the wrong size
@@ -78,14 +86,6 @@
         return BUFFER_REJECTED;
     }
 
-    if (autoRefresh) {
-        *autoRefresh = item.mAutoRefresh;
-    }
-
-    if (queuedBuffer) {
-        *queuedBuffer = item.mQueuedBuffer;
-    }
-
     // Release the previous buffer.
 #ifdef USE_HWC2
     err = updateAndReleaseLocked(item, &mPendingRelease);