commit b5ecae7bb0b9a260045752ecb16c011471b88988
author Ady Abraham <adyabr@google.com> Mon Mar 15 18:11:13 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 15 18:11:13 2021 +0000
tree e1e6e3e6bf2b593a49a1c4a3172f7f5af36b5eee
parent 49c01d0ba280ec49cbccea8e1672aa975a3d307f
parent c7900120feb6eb95991c66c63a21653f266ec337

Merge "SF: avoid calling pendingBuffers.insert twice" into sc-dev

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 44006b8..94d798f 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -3420,7 +3420,7 @@
         const auto vsyncId = frameTimelineInfoChanged ? s.frameTimelineInfo.vsyncId : info.vsyncId;
         if (isAutoTimestamp && layer->frameIsEarly(expectedPresentTime, vsyncId)) {
             ATRACE_NAME("frameIsEarly()");
-            return false;
+            ready = false;
         }
 
         if (!mScheduler->isVsyncValid(expectedPresentTime, layer->getOwnerUid())) {
@@ -3438,7 +3438,6 @@
             }
             pendingBuffers.insert(s.surface);
         }
-        pendingBuffers.insert(s.surface);
     }
     return ready;
 }