summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Dianne Hackborn <hackbod@google.com> 2016-06-29 20:45:36 +0000
committer android-build-merger <android-build-merger@google.com> 2016-06-29 20:45:36 +0000
commit381f4eb9bef36d06cad9fe225564e31cef56c8ef (patch)
treea8b6f24febe80f3b1c14493776ec660051435b21
parent8c8a5e92963fc38b3ebe0529e3e15b301f636630 (diff)
parent205bc262cee635c0574c92311e052d7f880bc9f2 (diff)
Merge \"Fix issue #29871385: Need JobScheduler.scheduleAsPackage to be system API\" into nyc-dev
am: 205bc262ce Change-Id: I910f4db4503ad20ecce46032691001d1f971bdbf
-rw-r--r--api/system-current.txt1
-rw-r--r--core/java/android/app/job/JobScheduler.java2
2 files changed, 3 insertions, 0 deletions
diff --git a/api/system-current.txt b/api/system-current.txt
index 7d601e4024e6..b5e2895b7324 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -6675,6 +6675,7 @@ package android.app.job {
method public abstract java.util.List<android.app.job.JobInfo> getAllPendingJobs();
method public abstract android.app.job.JobInfo getPendingJob(int);
method public abstract int schedule(android.app.job.JobInfo);
+ method public abstract int scheduleAsPackage(android.app.job.JobInfo, java.lang.String, int, java.lang.String);
field public static final int RESULT_FAILURE = 0; // 0x0
field public static final int RESULT_SUCCESS = 1; // 0x1
}
diff --git a/core/java/android/app/job/JobScheduler.java b/core/java/android/app/job/JobScheduler.java
index 9618cd10c086..1b640d08dde2 100644
--- a/core/java/android/app/job/JobScheduler.java
+++ b/core/java/android/app/job/JobScheduler.java
@@ -18,6 +18,7 @@ package android.app.job;
import android.annotation.NonNull;
import android.annotation.Nullable;
+import android.annotation.SystemApi;
import java.util.List;
@@ -75,6 +76,7 @@ public abstract class JobScheduler {
* @return {@link #RESULT_SUCCESS} or {@link #RESULT_FAILURE}
* @hide
*/
+ @SystemApi
public abstract int scheduleAsPackage(JobInfo job, String packageName, int userId, String tag);
/**