Merge "A few API naming/annotation tweaks:" into androidx-master-dev
diff --git a/work/workmanager/api/current.txt b/work/workmanager/api/current.txt
index 10640a5..0a7d318 100644
--- a/work/workmanager/api/current.txt
+++ b/work/workmanager/api/current.txt
@@ -14,8 +14,8 @@
public final class Configuration {
method public java.util.concurrent.Executor getExecutor();
- method public int getMaxJobSchedulerID();
- method public int getMinJobSchedulerID();
+ method public int getMaxJobSchedulerId();
+ method public int getMinJobSchedulerId();
method public androidx.work.WorkerFactory getWorkerFactory();
field public static final int MIN_SCHEDULER_LIMIT = 20; // 0x14
}
diff --git a/work/workmanager/src/main/java/androidx/work/Configuration.java b/work/workmanager/src/main/java/androidx/work/Configuration.java
index 9e61a52..a31fae9 100644
--- a/work/workmanager/src/main/java/androidx/work/Configuration.java
+++ b/work/workmanager/src/main/java/androidx/work/Configuration.java
@@ -95,11 +95,11 @@
* creating new instances of {@link android.app.job.JobInfo}s.
*
* If the current {@code jobId} goes beyond the bounds of the defined range of
- * ({@link Configuration.Builder#getMinJobSchedulerID()},
- * {@link Configuration.Builder#getMaxJobSchedulerID()}), it is reset to
- * ({@link Configuration.Builder#getMinJobSchedulerID()}).
+ * ({@link Configuration.Builder#getMinJobSchedulerId()},
+ * {@link Configuration.Builder#getMaxJobSchedulerId()}), it is reset to
+ * ({@link Configuration.Builder#getMinJobSchedulerId()}).
*/
- public int getMinJobSchedulerID() {
+ public int getMinJobSchedulerId() {
return mMinJobSchedulerId;
}
@@ -108,11 +108,11 @@
* creating new instances of {@link android.app.job.JobInfo}s.
*
* If the current {@code jobId} goes beyond the bounds of the defined range of
- * ({@link Configuration.Builder#getMinJobSchedulerID()},
- * {@link Configuration.Builder#getMaxJobSchedulerID()}), it is reset to
- * ({@link Configuration.Builder#getMinJobSchedulerID()}).
+ * ({@link Configuration.Builder#getMinJobSchedulerId()},
+ * {@link Configuration.Builder#getMaxJobSchedulerId()}), it is reset to
+ * ({@link Configuration.Builder#getMinJobSchedulerId()}).
*/
- public int getMaxJobSchedulerID() {
+ public int getMaxJobSchedulerId() {
return mMaxJobSchedulerId;
}
diff --git a/work/workmanager/src/main/java/androidx/work/Worker.java b/work/workmanager/src/main/java/androidx/work/Worker.java
index 9b92280..a4d683d 100644
--- a/work/workmanager/src/main/java/androidx/work/Worker.java
+++ b/work/workmanager/src/main/java/androidx/work/Worker.java
@@ -95,7 +95,7 @@
/**
* @return the output {@link Data} set by the {@link Worker}.
*/
- public final Data getOutputData() {
+ public final @NonNull Data getOutputData() {
return mOutputData;
}
}
diff --git a/work/workmanager/src/main/java/androidx/work/impl/background/systemjob/SystemJobScheduler.java b/work/workmanager/src/main/java/androidx/work/impl/background/systemjob/SystemJobScheduler.java
index 700d8b8..67ecd38 100644
--- a/work/workmanager/src/main/java/androidx/work/impl/background/systemjob/SystemJobScheduler.java
+++ b/work/workmanager/src/main/java/androidx/work/impl/background/systemjob/SystemJobScheduler.java
@@ -104,8 +104,8 @@
.getSystemIdInfo(workSpec.id);
int jobId = info != null ? info.systemId : mIdGenerator.nextJobSchedulerIdWithRange(
- mWorkManager.getConfiguration().getMinJobSchedulerID(),
- mWorkManager.getConfiguration().getMaxJobSchedulerID());
+ mWorkManager.getConfiguration().getMinJobSchedulerId(),
+ mWorkManager.getConfiguration().getMaxJobSchedulerId());
if (info == null) {
SystemIdInfo newSystemIdInfo = new SystemIdInfo(workSpec.id, jobId);
@@ -123,8 +123,8 @@
// in SystemJobService as needed.
if (Build.VERSION.SDK_INT == 23) {
int nextJobId = mIdGenerator.nextJobSchedulerIdWithRange(
- mWorkManager.getConfiguration().getMinJobSchedulerID(),
- mWorkManager.getConfiguration().getMaxJobSchedulerID());
+ mWorkManager.getConfiguration().getMinJobSchedulerId(),
+ mWorkManager.getConfiguration().getMaxJobSchedulerId());
scheduleInternal(workSpec, nextJobId);
}
