Add Thread.currentThread().interrupt() for InterruptedExceptions.

PiperOrigin-RevId: 549975878

libraries/effect/src/androidTest/java/androidx/media3/effect/DefaultVideoFrameProcessorVideoFrameRenderingTest.java

@@ -112,6 +112,7 @@ public final class DefaultVideoFrameProcessorVideoFrameRenderingTest {
             // to swap buffers, to avoid this behavior.
             Thread.sleep(PER_FRAME_RENDERING_WAIT_TIME_MS);
           } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
             throw new IllegalStateException(e);
           }
         },
@@ -228,6 +229,7 @@ public final class DefaultVideoFrameProcessorVideoFrameRenderingTest {
             // to swap buffers, to avoid this behavior.
             Thread.sleep(PER_FRAME_RENDERING_WAIT_TIME_MS);
           } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
             throw new IllegalStateException(e);
           }
         },

libraries/effect/src/main/java/androidx/media3/effect/BitmapOverlay.java

@@ -146,7 +146,10 @@ public abstract class BitmapOverlay extends TextureOverlay {
           ListenableFuture<Bitmap> future = bitmapLoader.loadBitmap(overlayBitmapUri);
           try {
             lastBitmap = future.get();
-          } catch (ExecutionException | InterruptedException e) {
+          } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            throw new VideoFrameProcessingException(e);
+          } catch (ExecutionException e) {
             throw new VideoFrameProcessingException(e);
           }
         }

libraries/transformer/src/androidTest/java/androidx/media3/transformer/TransformerAndroidTestRunner.java

@@ -202,10 +202,13 @@ public class TransformerAndroidTestRunner {
         throw exportTestResult.analysisException;
       }
       return exportTestResult;
-    } catch (InterruptedException
+    } catch (InterruptedException e) {
-        | IOException
+      Thread.currentThread().interrupt();
-        | TimeoutException
+      resultJson.put(
-        | UnsupportedOperationException e) {
+          "exportResult",
+          new JSONObject().put("testException", AndroidTestUtil.exceptionAsJsonObject(e)));
+      throw e;
+    } catch (IOException | TimeoutException | UnsupportedOperationException e) {
       resultJson.put(
           "exportResult",
           new JSONObject().put("testException", AndroidTestUtil.exceptionAsJsonObject(e)));
@@ -404,6 +407,7 @@ public class TransformerAndroidTestRunner {
               /* distortedVideoPath= */ outputVideoFile.getPath());
       testResultBuilder.setSsim(ssim);
     } catch (InterruptedException interruptedException) {
+      Thread.currentThread().interrupt();
       // InterruptedException is a special unexpected case because it is not related to Ssim
       // calculation, so it should be thrown, rather than processed as part of the
       // ExportTestResult.

libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/DefaultVideoFrameProcessorTextureOutputPixelTest.java

@@ -558,6 +558,7 @@ public final class DefaultVideoFrameProcessorTextureOutputPixelTest {
     try {
       videoFrameProcessorTestRunner.endFrameProcessing(VIDEO_FRAME_PROCESSING_WAIT_MS / 2);
     } catch (InterruptedException e) {
+      Thread.currentThread().interrupt();
       throw new VideoFrameProcessingException(e);
     }
     releaseOutputTextureCallback.release(presentationTimeUs);

libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/FileUtil.java

@@ -46,7 +46,10 @@ import java.util.concurrent.ExecutionException;
       trackGroupArray =
           MetadataRetriever.retrieveMetadata(context, MediaItem.fromUri("file://" + filePath))
               .get();
-    } catch (ExecutionException | InterruptedException e) {
+    } catch (InterruptedException e) {
+      Thread.currentThread().interrupt();
+      throw new IllegalStateException(e);
+    } catch (ExecutionException e) {
       throw new IllegalStateException(e);
     }
 

libraries/transformer/src/test/java/androidx/media3/transformer/ExoPlayerAssetLoaderTest.java

@@ -116,6 +116,7 @@ public class ExoPlayerAssetLoaderTest {
             try {
               Thread.sleep(10);
             } catch (InterruptedException e) {
+              Thread.currentThread().interrupt();
               exceptionRef.set(e);
             }
           }

libraries/transformer/src/test/java/androidx/media3/transformer/ImageAssetLoaderTest.java

@@ -94,6 +94,7 @@ public class ImageAssetLoaderTest {
             try {
               Thread.sleep(10);
             } catch (InterruptedException e) {
+              Thread.currentThread().interrupt();
               exceptionRef.set(e);
             }
           }

libraries/transformer/src/test/java/androidx/media3/transformer/MediaItemExportTest.java

@@ -1239,6 +1239,7 @@ public final class MediaItemExportTest {
         try {
           Thread.sleep(delayBetweenReadsMs);
         } catch (InterruptedException e) {
+          Thread.currentThread().interrupt();
           throw new IllegalStateException(e);
         }
         return extractor.read(input, seekPosition);

libraries/transformer/src/test/java/androidx/media3/transformer/TextureAssetLoaderTest.java

@@ -95,6 +95,7 @@ public class TextureAssetLoaderTest {
             try {
               Thread.sleep(10);
             } catch (InterruptedException e) {
+              Thread.currentThread().interrupt();
               exceptionRef.set(e);
             }
           }