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> foregroundColorSpans(Spanned actualSpanned) { - return (FailureMetadata metadata, List spans) -> + return (FailureMetadata metadata, @Nullable List 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> backgroundColorSpans(Spanned actualSpanned) { - return (FailureMetadata metadata, List spans) -> + return (FailureMetadata metadata, @Nullable List 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> absoluteSizeSpans( Spanned actualSpanned) { - return (FailureMetadata metadata, List spans) -> + return (FailureMetadata metadata, @Nullable List 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> rubySpans(Spanned actualSpanned) { - return (FailureMetadata metadata, List spans) -> + return (FailureMetadata metadata, @Nullable List spans) -> new RubySpansSubject(metadata, spans, actualSpanned); }