From 901f89c4566c265cd681ec157a0839b24ec2f93c Mon Sep 17 00:00:00 2001
From: ibaker <ibaker@google.com>
Date: Thu, 2 Nov 2023 10:06:06 -0700
Subject: [PATCH] Add `@CheckReturnValue` to `ParsableByteArray` and
 `ParsableBitArray`

This helps encourage usages of `skipXXX()` methods instead of
`readXXX()`.

PiperOrigin-RevId: 578892379
---
 .../java/androidx/media3/common/util/ParsableBitArray.java  | 2 ++
 .../java/androidx/media3/common/util/ParsableByteArray.java | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/libraries/common/src/main/java/androidx/media3/common/util/ParsableBitArray.java b/libraries/common/src/main/java/androidx/media3/common/util/ParsableBitArray.java
index cb2f89aab6..eabd9eb14e 100644
--- a/libraries/common/src/main/java/androidx/media3/common/util/ParsableBitArray.java
+++ b/libraries/common/src/main/java/androidx/media3/common/util/ParsableBitArray.java
@@ -18,10 +18,12 @@ package androidx.media3.common.util;
 import static java.lang.Math.min;
 
 import com.google.common.base.Charsets;
+import com.google.errorprone.annotations.CheckReturnValue;
 import java.nio.charset.Charset;
 
 /** Wraps a byte array, providing methods that allow it to be read as a bitstream. */
 @UnstableApi
+@CheckReturnValue
 public final class ParsableBitArray {
 
   public byte[] data;
diff --git a/libraries/common/src/main/java/androidx/media3/common/util/ParsableByteArray.java b/libraries/common/src/main/java/androidx/media3/common/util/ParsableByteArray.java
index 9e9e6ead0a..2f267a241b 100644
--- a/libraries/common/src/main/java/androidx/media3/common/util/ParsableByteArray.java
+++ b/libraries/common/src/main/java/androidx/media3/common/util/ParsableByteArray.java
@@ -20,6 +20,7 @@ import com.google.common.base.Charsets;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.primitives.Chars;
 import com.google.common.primitives.UnsignedBytes;
+import com.google.errorprone.annotations.CheckReturnValue;
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
 import java.util.Arrays;
@@ -29,6 +30,7 @@ import java.util.Arrays;
  * parsed with the assumption that their constituent bytes are in big endian order.
  */
 @UnstableApi
+@CheckReturnValue
 public final class ParsableByteArray {
 
   private static final char[] CR_AND_LF = {'\r', '\n'};
@@ -549,7 +551,7 @@ public final class ParsableByteArray {
       return null;
     }
     if (!charset.equals(Charsets.US_ASCII)) {
-      readUtfCharsetFromBom(); // Skip BOM if present
+      Charset unused = readUtfCharsetFromBom(); // Skip BOM if present
     }
     int lineLimit = findNextLineTerminator(charset);
     String line = readString(lineLimit - position, charset);
@@ -652,7 +654,7 @@ public final class ParsableByteArray {
 
   private void skipLineTerminator(Charset charset) {
     if (readCharacterIfInList(charset, CR_AND_LF) == '\r') {
-      readCharacterIfInList(charset, LF);
+      char unused = readCharacterIfInList(charset, LF);
     }
   }