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 b7818546f9..677d3c2ebd 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 @@ -129,7 +129,7 @@ public final class JobDispatcherScheduler implements Scheduler { Bundle extras = new Bundle(); extras.putString(KEY_SERVICE_ACTION, serviceAction); extras.putString(KEY_SERVICE_PACKAGE, servicePackage); - extras.putInt(KEY_REQUIREMENTS, requirements.getRequirementsData()); + extras.putInt(KEY_REQUIREMENTS, requirements.getRequirements()); builder.setExtras(extras); return builder.build(); diff --git a/library/core/src/main/java/com/google/android/exoplayer2/scheduler/PlatformScheduler.java b/library/core/src/main/java/com/google/android/exoplayer2/scheduler/PlatformScheduler.java index ed06d3745a..b8272dc036 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/scheduler/PlatformScheduler.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/scheduler/PlatformScheduler.java @@ -130,7 +130,7 @@ public final class PlatformScheduler implements Scheduler { PersistableBundle extras = new PersistableBundle(); extras.putString(KEY_SERVICE_ACTION, serviceAction); extras.putString(KEY_SERVICE_PACKAGE, servicePackage); - extras.putInt(KEY_REQUIREMENTS, requirements.getRequirementsData()); + extras.putInt(KEY_REQUIREMENTS, requirements.getRequirements()); builder.setExtras(extras); return builder.build(); diff --git a/library/core/src/main/java/com/google/android/exoplayer2/scheduler/Requirements.java b/library/core/src/main/java/com/google/android/exoplayer2/scheduler/Requirements.java index 5acd31ee0d..4019d1ae70 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/scheduler/Requirements.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/scheduler/Requirements.java @@ -25,6 +25,7 @@ import android.net.NetworkInfo; import android.os.BatteryManager; import android.os.PowerManager; import android.support.annotation.IntDef; +import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Log; import com.google.android.exoplayer2.util.Util; import java.lang.annotation.Documented; @@ -50,22 +51,49 @@ public final class Requirements { NETWORK_TYPE_METERED, }) public @interface NetworkType {} + + /** + * Requirement flags. + * + *

Combination of the following values is possible: + * + *