From 3ce6c061696537f4db9356010ae8ed7057a4825d Mon Sep 17 00:00:00 2001
From: ibaker <ibaker@google.com>
Date: Thu, 15 Jun 2023 12:24:19 +0100
Subject: [PATCH] Rollback of
 https://github.com/androidx/media/commit/45d35c5d78fdb4cd3f49130eec1afd209312c8cc

*** Original commit ***

Suppress warnings in preparation for Checker Framework version 3.34.0-eisop1

***

PiperOrigin-RevId: 540539608
---
 .../media3/test/utils/truth/SpannedSubject.java  | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/libraries/test_utils/src/main/java/androidx/media3/test/utils/truth/SpannedSubject.java b/libraries/test_utils/src/main/java/androidx/media3/test/utils/truth/SpannedSubject.java
index 01b014f40e..4871dbb48b 100644
--- a/libraries/test_utils/src/main/java/androidx/media3/test/utils/truth/SpannedSubject.java
+++ b/libraries/test_utils/src/main/java/androidx/media3/test/utils/truth/SpannedSubject.java
@@ -845,11 +845,9 @@ public final class SpannedSubject extends Subject {
 
   private static final Colored ALREADY_FAILED_COLORED = color -> ALREADY_FAILED_AND_FLAGS;
 
-  // incompatible parameter types for parameter 1 in lambda expression.
-  @SuppressWarnings("nullness:lambda.param.type.incompatible")
   private static Factory<ForegroundColorSpansSubject, List<ForegroundColorSpan>>
       foregroundColorSpans(Spanned actualSpanned) {
-    return (FailureMetadata metadata, List<ForegroundColorSpan> spans) ->
+    return (FailureMetadata metadata, @Nullable List<ForegroundColorSpan> spans) ->
         new ForegroundColorSpansSubject(metadata, spans, actualSpanned);
   }
 
@@ -886,11 +884,9 @@ public final class SpannedSubject extends Subject {
     }
   }
 
-  // incompatible parameter types for parameter 1 in lambda expression.
-  @SuppressWarnings("nullness:lambda.param.type.incompatible")
   private static Factory<BackgroundColorSpansSubject, List<BackgroundColorSpan>>
       backgroundColorSpans(Spanned actualSpanned) {
-    return (FailureMetadata metadata, List<BackgroundColorSpan> spans) ->
+    return (FailureMetadata metadata, @Nullable List<BackgroundColorSpan> spans) ->
         new BackgroundColorSpansSubject(metadata, spans, actualSpanned);
   }
 
@@ -991,11 +987,9 @@ public final class SpannedSubject extends Subject {
   private static final AbsoluteSized ALREADY_FAILED_ABSOLUTE_SIZED =
       size -> ALREADY_FAILED_AND_FLAGS;
 
-  // incompatible parameter types for parameter 1 in lambda expression.
-  @SuppressWarnings("nullness:lambda.param.type.incompatible")
   private static Factory<AbsoluteSizeSpansSubject, List<AbsoluteSizeSpan>> absoluteSizeSpans(
       Spanned actualSpanned) {
-    return (FailureMetadata metadata, List<AbsoluteSizeSpan> spans) ->
+    return (FailureMetadata metadata, @Nullable List<AbsoluteSizeSpan> spans) ->
         new AbsoluteSizeSpansSubject(metadata, spans, actualSpanned);
   }
 
@@ -1097,10 +1091,8 @@ public final class SpannedSubject extends Subject {
   private static final RubyText ALREADY_FAILED_WITH_TEXT =
       (text, position) -> ALREADY_FAILED_AND_FLAGS;
 
-  // incompatible parameter types for parameter 1 in lambda expression.
-  @SuppressWarnings("nullness:lambda.param.type.incompatible")
   private static Factory<RubySpansSubject, List<RubySpan>> rubySpans(Spanned actualSpanned) {
-    return (FailureMetadata metadata, List<RubySpan> spans) ->
+    return (FailureMetadata metadata, @Nullable List<RubySpan> spans) ->
         new RubySpansSubject(metadata, spans, actualSpanned);
   }