Merge "Fix condition for waiting next frame" into main

Treehugger Robot · Android (Google) Code Review · commit 27e2f43fdf2c · 2024-11-01T16:30:36.000Z
diff --git a/libs/gui/Surface.cpp b/libs/gui/Surface.cpp
@@ -2735,8 +2735,8 @@ status_t Surface::unlockAndPost()
 
 bool Surface::waitForNextFrame(uint64_t lastFrame, nsecs_t timeout) {
     Mutex::Autolock lock(mMutex);
-    if (mNextFrameNumber > lastFrame) {
-      return true;
+    if (mLastFrameNumber > lastFrame) {
+        return true;
     }
     return mQueueBufferCondition.waitRelative(mMutex, timeout) == OK;
 }

Original file line number	Diff line number	Diff line change
`@@ -2735,8 +2735,8 @@ status_t Surface::unlockAndPost()`
`2735`	`2735`
`2736`	`2736`	`bool Surface::waitForNextFrame(uint64_t lastFrame, nsecs_t timeout) {`
`2737`	`2737`	`Mutex::Autolock lock(mMutex);`
`2738`		`- if (mNextFrameNumber > lastFrame) {`
`2739`		`- return true;`
	`2738`	`+ if (mLastFrameNumber > lastFrame) {`
	`2739`	`+ return true;`
`2740`	`2740`	`}`
`2741`	`2741`	`return mQueueBufferCondition.waitRelative(mMutex, timeout) == OK;`
`2742`	`2742`	`}`