From 099cc384a81e3f7a5e8de31da438246abdd6afe3 Mon Sep 17 00:00:00 2001 From: olly Date: Mon, 26 Feb 2018 06:16:09 -0800 Subject: [PATCH] Move scheduler into its own top level package The util package is, in practice, for things that are misc enough to not warrant their own package. If something is deserving of a package, it's IMO best placed somewhere else (I know you could argue it's a util, but you could argue that about almost anything else as well). ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=187010018 --- .../ext/jobdispatcher/JobDispatcherScheduler.java | 4 ++-- .../google/android/exoplayer2/offline/DownloadService.java | 6 +++--- .../exoplayer2/{util => }/scheduler/PlatformScheduler.java | 2 +- .../exoplayer2/{util => }/scheduler/Requirements.java | 2 +- .../{util => }/scheduler/RequirementsWatcher.java | 2 +- .../android/exoplayer2/{util => }/scheduler/Scheduler.java | 2 +- .../source/dash/offline/DownloadServiceDashTest.java | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) rename library/core/src/main/java/com/google/android/exoplayer2/{util => }/scheduler/PlatformScheduler.java (99%) rename library/core/src/main/java/com/google/android/exoplayer2/{util => }/scheduler/Requirements.java (99%) rename library/core/src/main/java/com/google/android/exoplayer2/{util => }/scheduler/RequirementsWatcher.java (99%) rename library/core/src/main/java/com/google/android/exoplayer2/{util => }/scheduler/Scheduler.java (95%) diff --git a/extensions/jobdispatcher/src/main/java/com/google/android/exoplayer2/ext/jobdispatcher/JobDispatcherScheduler.java b/extensions/jobdispatcher/src/main/java/com/google/android/exoplayer2/ext/jobdispatcher/JobDispatcherScheduler.java index 908e7f26c7..9232efaaa9 100644 --- a/extensions/jobdispatcher/src/main/java/com/google/android/exoplayer2/ext/jobdispatcher/JobDispatcherScheduler.java +++ b/extensions/jobdispatcher/src/main/java/com/google/android/exoplayer2/ext/jobdispatcher/JobDispatcherScheduler.java @@ -29,9 +29,9 @@ import com.firebase.jobdispatcher.Job.Builder; import com.firebase.jobdispatcher.JobParameters; import com.firebase.jobdispatcher.JobService; import com.firebase.jobdispatcher.Lifetime; +import com.google.android.exoplayer2.scheduler.Requirements; +import com.google.android.exoplayer2.scheduler.Scheduler; import com.google.android.exoplayer2.util.Util; -import com.google.android.exoplayer2.util.scheduler.Requirements; -import com.google.android.exoplayer2.util.scheduler.Scheduler; /** * A {@link Scheduler} which uses {@link com.firebase.jobdispatcher.FirebaseJobDispatcher} to diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java index b6899299c9..0a6bc062f1 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java @@ -30,10 +30,10 @@ import android.support.annotation.Nullable; import android.util.Log; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.offline.DownloadManager.DownloadState; +import com.google.android.exoplayer2.scheduler.Requirements; +import com.google.android.exoplayer2.scheduler.RequirementsWatcher; +import com.google.android.exoplayer2.scheduler.Scheduler; import com.google.android.exoplayer2.util.Util; -import com.google.android.exoplayer2.util.scheduler.Requirements; -import com.google.android.exoplayer2.util.scheduler.RequirementsWatcher; -import com.google.android.exoplayer2.util.scheduler.Scheduler; import java.io.IOException; /** diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/scheduler/PlatformScheduler.java b/library/core/src/main/java/com/google/android/exoplayer2/scheduler/PlatformScheduler.java similarity index 99% rename from library/core/src/main/java/com/google/android/exoplayer2/util/scheduler/PlatformScheduler.java rename to library/core/src/main/java/com/google/android/exoplayer2/scheduler/PlatformScheduler.java index 2bc0034c9b..cd1e12520e 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/util/scheduler/PlatformScheduler.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/scheduler/PlatformScheduler.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.scheduler; +package com.google.android.exoplayer2.scheduler; import android.annotation.TargetApi; import android.app.Notification; diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/scheduler/Requirements.java b/library/core/src/main/java/com/google/android/exoplayer2/scheduler/Requirements.java similarity index 99% rename from library/core/src/main/java/com/google/android/exoplayer2/util/scheduler/Requirements.java rename to library/core/src/main/java/com/google/android/exoplayer2/scheduler/Requirements.java index 64b4ccdc31..8c8cf6a3b5 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/util/scheduler/Requirements.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/scheduler/Requirements.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.scheduler; +package com.google.android.exoplayer2.scheduler; import android.content.Context; import android.content.Intent; diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/scheduler/RequirementsWatcher.java b/library/core/src/main/java/com/google/android/exoplayer2/scheduler/RequirementsWatcher.java similarity index 99% rename from library/core/src/main/java/com/google/android/exoplayer2/util/scheduler/RequirementsWatcher.java rename to library/core/src/main/java/com/google/android/exoplayer2/scheduler/RequirementsWatcher.java index 05a1e7a493..9509c7e5b8 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/util/scheduler/RequirementsWatcher.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/scheduler/RequirementsWatcher.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.scheduler; +package com.google.android.exoplayer2.scheduler; import android.annotation.TargetApi; import android.content.BroadcastReceiver; diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/scheduler/Scheduler.java b/library/core/src/main/java/com/google/android/exoplayer2/scheduler/Scheduler.java similarity index 95% rename from library/core/src/main/java/com/google/android/exoplayer2/util/scheduler/Scheduler.java rename to library/core/src/main/java/com/google/android/exoplayer2/scheduler/Scheduler.java index 395c4c7090..9a9c57443f 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/util/scheduler/Scheduler.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/scheduler/Scheduler.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.scheduler; +package com.google.android.exoplayer2.scheduler; /** * Implementer of this interface schedules one implementation specific job to be run when some diff --git a/library/dash/src/androidTest/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java b/library/dash/src/androidTest/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java index 13c5a5c42f..2a6d127aa0 100644 --- a/library/dash/src/androidTest/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java +++ b/library/dash/src/androidTest/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java @@ -26,6 +26,8 @@ import android.test.InstrumentationTestCase; import com.google.android.exoplayer2.offline.DownloadManager; import com.google.android.exoplayer2.offline.DownloadService; import com.google.android.exoplayer2.offline.DownloaderConstructorHelper; +import com.google.android.exoplayer2.scheduler.Requirements; +import com.google.android.exoplayer2.scheduler.Scheduler; import com.google.android.exoplayer2.source.dash.manifest.RepresentationKey; import com.google.android.exoplayer2.testutil.DummyMainThread; import com.google.android.exoplayer2.testutil.FakeDataSet; @@ -36,8 +38,6 @@ import com.google.android.exoplayer2.upstream.cache.NoOpCacheEvictor; import com.google.android.exoplayer2.upstream.cache.SimpleCache; import com.google.android.exoplayer2.util.ConditionVariable; import com.google.android.exoplayer2.util.Util; -import com.google.android.exoplayer2.util.scheduler.Requirements; -import com.google.android.exoplayer2.util.scheduler.Scheduler; import java.io.File; import java.io.IOException;