From 58d8850b21641f794a7a99be753497a692695a8a Mon Sep 17 00:00:00 2001 From: tonihei Date: Tue, 31 Oct 2023 12:56:32 +0000 Subject: [PATCH] Satisfy nullness checker correctness by using local variable --- .../media3/decoder/SimpleDecoderOutputBuffer.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libraries/decoder/src/main/java/androidx/media3/decoder/SimpleDecoderOutputBuffer.java b/libraries/decoder/src/main/java/androidx/media3/decoder/SimpleDecoderOutputBuffer.java index 40f14d5213..a694250d8a 100644 --- a/libraries/decoder/src/main/java/androidx/media3/decoder/SimpleDecoderOutputBuffer.java +++ b/libraries/decoder/src/main/java/androidx/media3/decoder/SimpleDecoderOutputBuffer.java @@ -59,15 +59,15 @@ public class SimpleDecoderOutputBuffer extends DecoderOutputBuffer { * @return The {@link #data} buffer, for convenience. */ public ByteBuffer grow(int newSize) { - Assertions.checkNotNull(data); - Assertions.checkArgument(newSize >= data.limit()); - final ByteBuffer newData = ByteBuffer.allocateDirect(newSize).order(ByteOrder.nativeOrder()); - final int restorePosition = data.position(); - data.position(0); - newData.put(data); + ByteBuffer oldData = Assertions.checkNotNull(this.data); + Assertions.checkArgument(newSize >= oldData.limit()); + ByteBuffer newData = ByteBuffer.allocateDirect(newSize).order(ByteOrder.nativeOrder()); + int restorePosition = oldData.position(); + oldData.position(0); + newData.put(oldData); newData.position(restorePosition); newData.limit(newSize); - data = newData; + this.data = newData; return newData; }