From f8dde8ed5f1bfbfe1e976ffd252dd147aae19379 Mon Sep 17 00:00:00 2001 From: bachinger Date: Thu, 16 Sep 2021 14:31:49 +0100 Subject: [PATCH] Move classes from util package in lib-exoplayer PiperOrigin-RevId: 397066804 --- .../java/com/google/android/exoplayer2/util/AtomicFile.java | 0 .../com/google/android/exoplayer2/util/ColorParser.java | 0 .../google/android/exoplayer2/util/EGLSurfaceTexture.java | 0 .../google/android/exoplayer2/util/NetworkTypeObserver.java | 0 .../google/android/exoplayer2/util/NotificationUtil.java | 0 .../google/android/exoplayer2/util/PriorityTaskManager.java | 0 .../google/android/exoplayer2/util/RunnableFutureTask.java | 0 .../java/com/google/android/exoplayer2/util/UriUtil.java | 0 .../com/google/android/exoplayer2/util/AtomicFileTest.java | 0 .../com/google/android/exoplayer2/util/ColorParserTest.java | 0 .../android/exoplayer2/util/RunnableFutureTaskTest.java | 0 .../google/android/exoplayer2/util/TimedValueQueueTest.java | 0 .../com/google/android/exoplayer2/util/UriUtilTest.java | 0 .../android/exoplayer2/upstream/DefaultBandwidthMeter.java | 1 - .../exoplayer2/{util => upstream}/SlidingPercentile.java | 2 +- .../android/exoplayer2/upstream/cache/CacheDataSink.java | 1 - .../exoplayer2/upstream/cache/CachedContentIndex.java | 1 - .../cache}/ReusableBufferedOutputStream.java | 6 ++++-- .../cache}/ReusableBufferedOutputStreamTest.java | 3 ++- 19 files changed, 7 insertions(+), 7 deletions(-) rename library/{core => common}/src/main/java/com/google/android/exoplayer2/util/AtomicFile.java (100%) rename library/{core => common}/src/main/java/com/google/android/exoplayer2/util/ColorParser.java (100%) rename library/{core => common}/src/main/java/com/google/android/exoplayer2/util/EGLSurfaceTexture.java (100%) rename library/{core => common}/src/main/java/com/google/android/exoplayer2/util/NetworkTypeObserver.java (100%) rename library/{core => common}/src/main/java/com/google/android/exoplayer2/util/NotificationUtil.java (100%) rename library/{core => common}/src/main/java/com/google/android/exoplayer2/util/PriorityTaskManager.java (100%) rename library/{core => common}/src/main/java/com/google/android/exoplayer2/util/RunnableFutureTask.java (100%) rename library/{core => common}/src/main/java/com/google/android/exoplayer2/util/UriUtil.java (100%) rename library/{core => common}/src/test/java/com/google/android/exoplayer2/util/AtomicFileTest.java (100%) rename library/{core => common}/src/test/java/com/google/android/exoplayer2/util/ColorParserTest.java (100%) rename library/{core => common}/src/test/java/com/google/android/exoplayer2/util/RunnableFutureTaskTest.java (100%) rename library/{core => common}/src/test/java/com/google/android/exoplayer2/util/TimedValueQueueTest.java (100%) rename library/{core => common}/src/test/java/com/google/android/exoplayer2/util/UriUtilTest.java (100%) rename library/core/src/main/java/com/google/android/exoplayer2/{util => upstream}/SlidingPercentile.java (99%) rename library/core/src/main/java/com/google/android/exoplayer2/{util => upstream/cache}/ReusableBufferedOutputStream.java (88%) rename library/core/src/test/java/com/google/android/exoplayer2/{util => upstream/cache}/ReusableBufferedOutputStreamTest.java (94%) diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/AtomicFile.java b/library/common/src/main/java/com/google/android/exoplayer2/util/AtomicFile.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/util/AtomicFile.java rename to library/common/src/main/java/com/google/android/exoplayer2/util/AtomicFile.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/ColorParser.java b/library/common/src/main/java/com/google/android/exoplayer2/util/ColorParser.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/util/ColorParser.java rename to library/common/src/main/java/com/google/android/exoplayer2/util/ColorParser.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/EGLSurfaceTexture.java b/library/common/src/main/java/com/google/android/exoplayer2/util/EGLSurfaceTexture.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/util/EGLSurfaceTexture.java rename to library/common/src/main/java/com/google/android/exoplayer2/util/EGLSurfaceTexture.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/NetworkTypeObserver.java b/library/common/src/main/java/com/google/android/exoplayer2/util/NetworkTypeObserver.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/util/NetworkTypeObserver.java rename to library/common/src/main/java/com/google/android/exoplayer2/util/NetworkTypeObserver.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/NotificationUtil.java b/library/common/src/main/java/com/google/android/exoplayer2/util/NotificationUtil.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/util/NotificationUtil.java rename to library/common/src/main/java/com/google/android/exoplayer2/util/NotificationUtil.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/PriorityTaskManager.java b/library/common/src/main/java/com/google/android/exoplayer2/util/PriorityTaskManager.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/util/PriorityTaskManager.java rename to library/common/src/main/java/com/google/android/exoplayer2/util/PriorityTaskManager.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/RunnableFutureTask.java b/library/common/src/main/java/com/google/android/exoplayer2/util/RunnableFutureTask.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/util/RunnableFutureTask.java rename to library/common/src/main/java/com/google/android/exoplayer2/util/RunnableFutureTask.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/UriUtil.java b/library/common/src/main/java/com/google/android/exoplayer2/util/UriUtil.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/util/UriUtil.java rename to library/common/src/main/java/com/google/android/exoplayer2/util/UriUtil.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/util/AtomicFileTest.java b/library/common/src/test/java/com/google/android/exoplayer2/util/AtomicFileTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/util/AtomicFileTest.java rename to library/common/src/test/java/com/google/android/exoplayer2/util/AtomicFileTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/util/ColorParserTest.java b/library/common/src/test/java/com/google/android/exoplayer2/util/ColorParserTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/util/ColorParserTest.java rename to library/common/src/test/java/com/google/android/exoplayer2/util/ColorParserTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/util/RunnableFutureTaskTest.java b/library/common/src/test/java/com/google/android/exoplayer2/util/RunnableFutureTaskTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/util/RunnableFutureTaskTest.java rename to library/common/src/test/java/com/google/android/exoplayer2/util/RunnableFutureTaskTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/util/TimedValueQueueTest.java b/library/common/src/test/java/com/google/android/exoplayer2/util/TimedValueQueueTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/util/TimedValueQueueTest.java rename to library/common/src/test/java/com/google/android/exoplayer2/util/TimedValueQueueTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/util/UriUtilTest.java b/library/common/src/test/java/com/google/android/exoplayer2/util/UriUtilTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/util/UriUtilTest.java rename to library/common/src/test/java/com/google/android/exoplayer2/util/UriUtilTest.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeter.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeter.java index 7fd0928c61..c046ca8d45 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeter.java +++ b/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.Clock; import com.google.android.exoplayer2.util.NetworkTypeObserver; -import com.google.android.exoplayer2.util.SlidingPercentile; import com.google.android.exoplayer2.util.Util; import com.google.common.base.Ascii; import com.google.common.collect.ImmutableList; diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/SlidingPercentile.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/SlidingPercentile.java similarity index 99% rename from library/core/src/main/java/com/google/android/exoplayer2/util/SlidingPercentile.java rename to library/core/src/main/java/com/google/android/exoplayer2/upstream/SlidingPercentile.java index ebe5c2a5f4..b7385c8eda 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/util/SlidingPercentile.java +++ b/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 * limitations under the License. */ -package com.google.android.exoplayer2.util; +package com.google.android.exoplayer2.upstream; import java.util.ArrayList; import java.util.Collections; diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSink.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSink.java index 7661171e4c..93e520b042 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSink.java +++ b/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.util.Assertions; import com.google.android.exoplayer2.util.Log; -import com.google.android.exoplayer2.util.ReusableBufferedOutputStream; import com.google.android.exoplayer2.util.Util; import java.io.File; import java.io.FileOutputStream; diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java index f8289809f8..e8ba423a0a 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java +++ b/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.util.Assertions; import com.google.android.exoplayer2.util.AtomicFile; -import com.google.android.exoplayer2.util.ReusableBufferedOutputStream; import com.google.android.exoplayer2.util.Util; import com.google.common.collect.ImmutableSet; import java.io.BufferedInputStream; diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/ReusableBufferedOutputStream.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/ReusableBufferedOutputStream.java similarity index 88% rename from library/core/src/main/java/com/google/android/exoplayer2/util/ReusableBufferedOutputStream.java rename to library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/ReusableBufferedOutputStream.java index 1db3d2c1f4..b952fdc1b9 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/util/ReusableBufferedOutputStream.java +++ b/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 * 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.IOException; 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 * 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; diff --git a/library/core/src/test/java/com/google/android/exoplayer2/util/ReusableBufferedOutputStreamTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/ReusableBufferedOutputStreamTest.java similarity index 94% rename from library/core/src/test/java/com/google/android/exoplayer2/util/ReusableBufferedOutputStreamTest.java rename to library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/ReusableBufferedOutputStreamTest.java index bc1cc8a5cb..13a4099706 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/util/ReusableBufferedOutputStreamTest.java +++ b/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 * 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 androidx.test.ext.junit.runners.AndroidJUnit4; +import com.google.android.exoplayer2.util.Util; import java.io.ByteArrayOutputStream; import org.junit.Test; import org.junit.runner.RunWith;