From 7edcc89421ca7fc0b67f06a894b68007b4775e5a Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 15 Jul 2021 09:50:56 +0100
Subject: [PATCH] Fix 1 ErrorProneStyle finding: * Constructors and methods
 with the same name should appear sequentially with no other code in between,
 even when modifiers such as static or private differ between the methods.
 Please re-order or re-name methods.   (see
 http://go/bugpattern/UngroupedOverloads)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This CL looks good? Just LGTM and Approve it!
This CL doesn’t look good? This is what you can do:
* Suggest a fix on the CL (go/how-to-suggest-fix).
* Revert this CL, by replying "REVERT: <provide reason>"
* File a bug under go/error-prone-bug for category ErrorProneStyle if the change looks generally problematic.
* Revert this CL and not get a CL that cleans up these paths in the future by
replying "BLOCKLIST: <provide reason>". This is not reversible! We recommend to
opt out the respective paths in your CL Robot configuration instead:
go/clrobot-opt-out.

This CL was generated by CL Robot - a tool that cleans up code findings
(go/clrobot). The affected code paths have been enabled for CL Robot in //depot/google3/java/com/google/android/libraries/media/METADATA which is reachable following include_presubmits from //depot/google3/third_party/java_src/android_libs/media/METADATA.
Anything wrong with the signup? File a bug at go/clrobot-bug.

#codehealth

PiperOrigin-RevId: 384877648
---
 .../exoplayer2/source/SampleQueueTest.java    | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/library/core/src/test/java/com/google/android/exoplayer2/source/SampleQueueTest.java b/library/core/src/test/java/com/google/android/exoplayer2/source/SampleQueueTest.java
index ce8b839d7f..71fbda3957 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/source/SampleQueueTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/source/SampleQueueTest.java
@@ -1394,16 +1394,6 @@ public final class SampleQueueTest {
         DATA, SAMPLE_SIZES, SAMPLE_OFFSETS, SAMPLE_TIMESTAMPS, SAMPLE_FORMATS, SAMPLE_FLAGS);
   }
 
-  private void writeTestDataWithEncryptedSections() {
-    writeTestData(
-        ENCRYPTED_SAMPLE_DATA,
-        ENCRYPTED_SAMPLE_SIZES,
-        ENCRYPTED_SAMPLE_OFFSETS,
-        ENCRYPTED_SAMPLE_TIMESTAMPS,
-        ENCRYPTED_SAMPLE_FORMATS,
-        ENCRYPTED_SAMPLES_FLAGS);
-  }
-
   /** Writes the specified test data to {@code sampleQueue}. */
   @SuppressWarnings("ReferenceEquality")
   private void writeTestData(
@@ -1429,6 +1419,16 @@ public final class SampleQueueTest {
     }
   }
 
+  private void writeTestDataWithEncryptedSections() {
+    writeTestData(
+        ENCRYPTED_SAMPLE_DATA,
+        ENCRYPTED_SAMPLE_SIZES,
+        ENCRYPTED_SAMPLE_OFFSETS,
+        ENCRYPTED_SAMPLE_TIMESTAMPS,
+        ENCRYPTED_SAMPLE_FORMATS,
+        ENCRYPTED_SAMPLES_FLAGS);
+  }
+
   /** Writes a {@link Format} to the {@code sampleQueue}. */
   private void writeFormat(Format format) {
     sampleQueue.format(format);