From 89e239eed1d5d3ba025d98e1d31169b2bd3aad74 Mon Sep 17 00:00:00 2001 From: hschlueter Date: Fri, 27 May 2022 12:31:30 +0000 Subject: [PATCH] Expand SSIM skipping to all Nexus API 21 devices. PiperOrigin-RevId: 451371681 --- .../exoplayer2/transformer/TransformerAndroidTestRunner.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/TransformerAndroidTestRunner.java b/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/TransformerAndroidTestRunner.java index 1928ac5019..76d452cf8c 100644 --- a/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/TransformerAndroidTestRunner.java +++ b/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/TransformerAndroidTestRunner.java @@ -27,6 +27,7 @@ import com.google.android.exoplayer2.MediaItem; import com.google.android.exoplayer2.util.Log; import com.google.android.exoplayer2.util.SystemClock; import com.google.android.exoplayer2.util.Util; +import com.google.common.base.Ascii; import java.io.File; import java.io.IOException; import java.util.List; @@ -340,7 +341,8 @@ public class TransformerAndroidTestRunner { // TransformationTestResult. throw interruptedException; } catch (Throwable analysisFailure) { - if (Util.SDK_INT == 21 && "Nexus 5".equals(Util.MODEL)) { // b/233584640 + if (Util.SDK_INT == 21 && Ascii.toLowerCase(Util.MODEL).contains("nexus")) { + // b/233584640, b/230093713 Log.i(TAG, testId + ": Skipping SSIM calculation due to known device-specific issue"); } else { // Catch all (checked and unchecked) failures thrown by the SsimHelper and process them as