From e759b44c4535b3f56b6ec4f60257cd782b9ef999 Mon Sep 17 00:00:00 2001
From: ibaker <ibaker@google.com>
Date: Fri, 26 Apr 2024 08:54:26 -0700
Subject: [PATCH] Remove `@Nullable` from `Dumper.add` methods

`checkNotNull` was added to the `Object` variant in https://github.com/androidx/media/commit/b83f12c4ba5f7adac388f003596214b03d1d9358. It
doesn't seem to have caused any test failures, so I guess we never
pass `null` in here - and might as well update the annotation to match
reality. And then for consistency we should ban `null` from the
`byte[]` overload too.

PiperOrigin-RevId: 628419003
---
 .../androidx/media3/test/utils/DumpableFormat.java |  3 +++
 .../java/androidx/media3/test/utils/Dumper.java    | 14 +++-----------
 .../test/utils/robolectric/PlaybackOutput.java     |  2 ++
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/libraries/test_utils/src/main/java/androidx/media3/test/utils/DumpableFormat.java b/libraries/test_utils/src/main/java/androidx/media3/test/utils/DumpableFormat.java
index 59cd6af726..5dfea7012c 100644
--- a/libraries/test_utils/src/main/java/androidx/media3/test/utils/DumpableFormat.java
+++ b/libraries/test_utils/src/main/java/androidx/media3/test/utils/DumpableFormat.java
@@ -15,6 +15,8 @@
  */
 package androidx.media3.test.utils;
 
+import static androidx.media3.common.util.Assertions.checkNotNull;
+
 import androidx.annotation.Nullable;
 import androidx.media3.common.ColorInfo;
 import androidx.media3.common.Format;
@@ -154,6 +156,7 @@ public final class DumpableFormat implements Dumper.Dumpable {
     @Nullable Object fieldValue = getFieldFunction.apply(value);
     @Nullable Object defaultFieldValue = getFieldFunction.apply(defaultValue);
     if (!Util.areEqual(fieldValue, defaultFieldValue)) {
+      checkNotNull(fieldValue);
       dumper.add(field, fieldValue);
     }
   }
diff --git a/libraries/test_utils/src/main/java/androidx/media3/test/utils/Dumper.java b/libraries/test_utils/src/main/java/androidx/media3/test/utils/Dumper.java
index 9bea1a4f73..4da377ebed 100644
--- a/libraries/test_utils/src/main/java/androidx/media3/test/utils/Dumper.java
+++ b/libraries/test_utils/src/main/java/androidx/media3/test/utils/Dumper.java
@@ -15,9 +15,6 @@
  */
 package androidx.media3.test.utils;
 
-import static androidx.media3.common.util.Assertions.checkNotNull;
-
-import androidx.annotation.Nullable;
 import androidx.media3.common.C;
 import androidx.media3.common.util.UnstableApi;
 import androidx.media3.common.util.Util;
@@ -49,8 +46,7 @@ public final class Dumper {
   }
 
   @CanIgnoreReturnValue
-  public Dumper add(String field, @Nullable Object value) {
-    checkNotNull(value);
+  public Dumper add(String field, Object value) {
     if (value instanceof byte[]) {
       return add(field, (byte[]) value);
     }
@@ -72,14 +68,10 @@ public final class Dumper {
   }
 
   @CanIgnoreReturnValue
-  public Dumper add(String field, @Nullable byte[] value) {
+  public Dumper add(String field, byte[] value) {
     String string =
         String.format(
-            Locale.US,
-            "%s = length %d, hash %X",
-            field,
-            value == null ? 0 : value.length,
-            Arrays.hashCode(value));
+            Locale.US, "%s = length %d, hash %X", field, value.length, Arrays.hashCode(value));
     return addLine(string);
   }
 
diff --git a/libraries/test_utils_robolectric/src/main/java/androidx/media3/test/utils/robolectric/PlaybackOutput.java b/libraries/test_utils_robolectric/src/main/java/androidx/media3/test/utils/robolectric/PlaybackOutput.java
index ebaeb3fdf5..12c49cb9eb 100644
--- a/libraries/test_utils_robolectric/src/main/java/androidx/media3/test/utils/robolectric/PlaybackOutput.java
+++ b/libraries/test_utils_robolectric/src/main/java/androidx/media3/test/utils/robolectric/PlaybackOutput.java
@@ -15,6 +15,7 @@
  */
 package androidx.media3.test.utils.robolectric;
 
+import static androidx.media3.common.util.Assertions.checkNotNull;
 import static java.lang.Math.max;
 
 import android.graphics.Bitmap;
@@ -426,6 +427,7 @@ public final class PlaybackOutput implements Dumper.Dumpable {
   private static void dumpIfNotEqual(
       Dumper dumper, String field, @Nullable Object actual, @Nullable Object comparison) {
     if (!Util.areEqual(actual, comparison)) {
+      checkNotNull(actual);
       dumper.add(field, actual);
     }
   }