From c7900120feb6eb95991c66c63a21653f266ec337 Mon Sep 17 00:00:00 2001
From: Ady Abraham <adyabr@google.com>
Date: Fri, 12 Mar 2021 13:51:01 -0800
Subject: SF: avoid calling pendingBuffers.insert twice

ag/13806579 accidently added another call to pendingBuffers.insert which
is incorrect.

Bug: 181978893
Test: SF unit tests
Change-Id: I3e7df528f8dcb1ccd8c5a83c51b23b8433a049d3
---
 services/surfaceflinger/SurfaceFlinger.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 3b0e5944af..7706ad5151 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -3412,7 +3412,7 @@ bool SurfaceFlinger::transactionIsReadyToBeApplied(
         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())) {
@@ -3430,7 +3430,6 @@ bool SurfaceFlinger::transactionIsReadyToBeApplied(
             }
             pendingBuffers.insert(s.surface);
         }
-        pendingBuffers.insert(s.surface);
     }
     return ready;
 }
-- 
cgit v1.2.3-59-g8ed1b