From 00ae09f4599ee11860d30daee96f4fdeb35ab5f8 Mon Sep 17 00:00:00 2001 From: bachinger Date: Tue, 31 May 2022 09:19:29 +0000 Subject: [PATCH] Add explicit cast to ByteBuffer for Java 8 compatibility PiperOrigin-RevId: 451994696 (cherry picked from commit 5cdac6575e662bf575b4890f17b600e7b17bffac) --- .../java/androidx/media3/decoder/opus/OpusDecoderTest.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libraries/decoder_opus/src/test/java/androidx/media3/decoder/opus/OpusDecoderTest.java b/libraries/decoder_opus/src/test/java/androidx/media3/decoder/opus/OpusDecoderTest.java index 59581dc6a6..f166a511c8 100644 --- a/libraries/decoder_opus/src/test/java/androidx/media3/decoder/opus/OpusDecoderTest.java +++ b/libraries/decoder_opus/src/test/java/androidx/media3/decoder/opus/OpusDecoderTest.java @@ -200,8 +200,12 @@ public final class OpusDecoderTest { return ImmutableList.of(HEADER, preSkip, CUSTOM_SEEK_PRE_ROLL_BYTES); } + // The cast to ByteBuffer is required for Java 8 compatibility. See + // https://issues.apache.org/jira/browse/MRESOLVER-85 + @SuppressWarnings("UnnecessaryCast") private static ByteBuffer createSupplementalData(long value) { - return ByteBuffer.allocate(8).order(ByteOrder.LITTLE_ENDIAN).putLong(value).rewind(); + return (ByteBuffer) + ByteBuffer.allocate(8).order(ByteOrder.LITTLE_ENDIAN).putLong(value).rewind(); } private static DecoderInputBuffer createInputBuffer(