From 3011a29940d430b75f213cfb5329c4aaf7477ccf Mon Sep 17 00:00:00 2001 From: tofunmi Date: Tue, 2 May 2023 19:53:46 +0100 Subject: [PATCH] Update InternetConnection check to skip check when uri scheme is null When we created androidTests, in the past, they always had a URI pointing to a resource, therefore we always had a URI scheme. With texture input, this will not longer be the case (EditedMediaItems's may have URI.EMPTY, which have a null scheme) so we need to check for this so tests don't falsely fail. PiperOrigin-RevId: 528848411 --- .../media3/transformer/TransformerAndroidTestRunner.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/TransformerAndroidTestRunner.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/TransformerAndroidTestRunner.java index 65e71404b1..1d131a562c 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/TransformerAndroidTestRunner.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/TransformerAndroidTestRunner.java @@ -274,8 +274,8 @@ public class TransformerAndroidTestRunner { for (EditedMediaItemSequence sequence : composition.sequences) { for (EditedMediaItem editedMediaItem : sequence.editedMediaItems) { Uri mediaItemUri = checkNotNull(editedMediaItem.mediaItem.localConfiguration).uri; - String scheme = checkNotNull(mediaItemUri.getScheme()); - if ((scheme.equals("http") || scheme.equals("https"))) { + String scheme = mediaItemUri.getScheme(); + if (scheme != null && (scheme.equals("http") || scheme.equals("https"))) { assumeTrue( "Input network file requested on device with no network connection. Input file" + " name: "