Move classes from util package in lib-exoplayer

PiperOrigin-RevId: 397066804

library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeter.java

@@ -23,7 +23,6 @@ import com.google.android.exoplayer2.upstream.BandwidthMeter.EventListener.Event
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Clock;
 import com.google.android.exoplayer2.util.Clock;
 import com.google.android.exoplayer2.util.NetworkTypeObserver;
 import com.google.android.exoplayer2.util.NetworkTypeObserver;
-import com.google.android.exoplayer2.util.SlidingPercentile;
 import com.google.android.exoplayer2.util.Util;
 import com.google.android.exoplayer2.util.Util;
 import com.google.common.base.Ascii;
 import com.google.common.base.Ascii;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableList;

library/core/src/main/java/com/google/android/exoplayer2/util/SlidingPercentile.java → library/core/src/main/java/com/google/android/exoplayer2/upstream/SlidingPercentile.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.google.android.exoplayer2.util;
+package com.google.android.exoplayer2.upstream;
 
 
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Collections;

library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSink.java

@@ -26,7 +26,6 @@ import com.google.android.exoplayer2.upstream.DataSpec;
 import com.google.android.exoplayer2.upstream.cache.Cache.CacheException;
 import com.google.android.exoplayer2.upstream.cache.Cache.CacheException;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Log;
 import com.google.android.exoplayer2.util.Log;
-import com.google.android.exoplayer2.util.ReusableBufferedOutputStream;
 import com.google.android.exoplayer2.util.Util;
 import com.google.android.exoplayer2.util.Util;
 import java.io.File;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.FileOutputStream;

library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java

@@ -36,7 +36,6 @@ import com.google.android.exoplayer2.database.DatabaseProvider;
 import com.google.android.exoplayer2.database.VersionTable;
 import com.google.android.exoplayer2.database.VersionTable;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.AtomicFile;
 import com.google.android.exoplayer2.util.AtomicFile;
-import com.google.android.exoplayer2.util.ReusableBufferedOutputStream;
 import com.google.android.exoplayer2.util.Util;
 import com.google.android.exoplayer2.util.Util;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSet;
 import java.io.BufferedInputStream;
 import java.io.BufferedInputStream;

library/core/src/main/java/com/google/android/exoplayer2/util/ReusableBufferedOutputStream.java → library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/ReusableBufferedOutputStream.java

@@ -13,8 +13,10 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.google.android.exoplayer2.util;
+package com.google.android.exoplayer2.upstream.cache;
 
 
+import com.google.android.exoplayer2.util.Assertions;
+import com.google.android.exoplayer2.util.Util;
 import java.io.BufferedOutputStream;
 import java.io.BufferedOutputStream;
 import java.io.IOException;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.OutputStream;
@@ -23,7 +25,7 @@ import java.io.OutputStream;
  * This is a subclass of {@link BufferedOutputStream} with a {@link #reset(OutputStream)} method
  * This is a subclass of {@link BufferedOutputStream} with a {@link #reset(OutputStream)} method
  * that allows an instance to be re-used with another underlying output stream.
  * that allows an instance to be re-used with another underlying output stream.
  */
  */
-public final class ReusableBufferedOutputStream extends BufferedOutputStream {
+/* package */ final class ReusableBufferedOutputStream extends BufferedOutputStream {
 
 
   private boolean closed;
   private boolean closed;
 
 

library/core/src/test/java/com/google/android/exoplayer2/util/ReusableBufferedOutputStreamTest.java → library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/ReusableBufferedOutputStreamTest.java

@@ -13,11 +13,12 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.google.android.exoplayer2.util;
+package com.google.android.exoplayer2.upstream.cache;
 
 
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertThat;
 
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
+import com.google.android.exoplayer2.util.Util;
 import java.io.ByteArrayOutputStream;
 import java.io.ByteArrayOutputStream;
 import org.junit.Test;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runner.RunWith;