From ae85ba9ee9fe55c37ffbbad62e010d318ce199d6 Mon Sep 17 00:00:00 2001
From: huangdarwin <huangdarwin@google.com>
Date: Fri, 2 Feb 2024 05:29:47 -0800
Subject: [PATCH] Effect: Remove extra checkStateNotNull by reordering logic.

PiperOrigin-RevId: 603660773
---
 .../java/androidx/media3/effect/ExternalTextureManager.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/effect/src/main/java/androidx/media3/effect/ExternalTextureManager.java b/libraries/effect/src/main/java/androidx/media3/effect/ExternalTextureManager.java
index e0048d5494..e57cb1c689 100644
--- a/libraries/effect/src/main/java/androidx/media3/effect/ExternalTextureManager.java
+++ b/libraries/effect/src/main/java/androidx/media3/effect/ExternalTextureManager.java
@@ -299,9 +299,9 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 
     surfaceTexture.updateTexImage();
     availableFrameCount--;
-    this.currentFrame = pendingFrames.element();
+    FrameInfo currentFrame = pendingFrames.element();
+    this.currentFrame = currentFrame;
 
-    FrameInfo currentFrame = checkStateNotNull(this.currentFrame);
     externalShaderProgramInputCapacity.decrementAndGet();
     surfaceTexture.getTransformMatrix(textureTransformMatrix);
     checkNotNull(externalShaderProgram).setTextureTransformMatrix(textureTransformMatrix);