Fix definition of NativeAnimated.isEmpty

javache · facebook-github-bot · commit bf405d70837e · 2022-05-06T02:45:47.000-07:00
Summary: Noticed in D36098912 (facebook@5de0f14) that the definition of NativeAnimatedModule's OperationQueue.isEmpty was incorrect as it didn't account for `mPeekedOperation`, while `drainQueueIntoList` did. Changelog: [Internal] Reviewed By: mdvacca Differential Revision: D36109810 fbshipit-source-id: afd7059975ce6e5c65d1975d168a03f0881bd7c1
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.java b/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.java
@@ -113,7 +113,7 @@ private class ConcurrentOperationQueue {
 
     @AnyThread
     boolean isEmpty() {
-      return mQueue.isEmpty();
+      return mQueue.isEmpty() && mPeekedOperation != null;
     }
 
     void setSynchronizedAccess(boolean isSynchronizedAccess) {
@@ -150,7 +150,7 @@ void executeBatch(long maxBatchNumber, NativeAnimatedNodesManager nodesManager)
 
     @UiThread
     private @Nullable List<UIThreadOperation> drainQueueIntoList(long maxBatchNumber) {
-      if (mQueue.isEmpty() && mPeekedOperation == null) {
+      if (isEmpty()) {
         return null;
       }
 

Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ private class ConcurrentOperationQueue {`
`113`	`113`
`114`	`114`	`@AnyThread`
`115`	`115`	`boolean isEmpty() {`
`116`		`- return mQueue.isEmpty();`
	`116`	`+ return mQueue.isEmpty() && mPeekedOperation != null;`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`void setSynchronizedAccess(boolean isSynchronizedAccess) {`
`@@ -150,7 +150,7 @@ void executeBatch(long maxBatchNumber, NativeAnimatedNodesManager nodesManager)`
`150`	`150`
`151`	`151`	`@UiThread`
`152`	`152`	`private @Nullable List<UIThreadOperation> drainQueueIntoList(long maxBatchNumber) {`
`153`		`- if (mQueue.isEmpty() && mPeekedOperation == null) {`
	`153`	`+ if (isEmpty()) {`
`154`	`154`	`return null;`
`155`	`155`	`}`
`156`	`156`