Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic 'stage-aosp-master-generics-api' into stage-aosp-master

Browse Source 
* changes:
  DO NOT MERGE Track generics in API definition.
  DO NOT MERGE Fix issue #29871385: Need JobScheduler.scheduleAsPackage to be system API
This commit is contained in:
TreeHugger Robot
2016-09-28 21:47:50 +00:00
committed by Android (Google) Code Review
parent 62bceaabe9 ae0c402a45
commit f8243e1e99
4 changed files with 1791 additions and 1788 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1192
api/current.txt
View File

File diff suppressed because it is too large Load Diff

1193
api/system-current.txt
View File

File diff suppressed because it is too large Load Diff

1192
api/test-current.txt
View File

File diff suppressed because it is too large Load Diff

2
core/java/android/app/job/JobScheduler.java
View File

@@ -18,6 +18,7 @@ package android.app.job;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.annotation.SystemApi;
import java.util.List; import java.util.List;
@@ -75,6 +76,7 @@ public abstract class JobScheduler {
* @return {@link #RESULT_SUCCESS} or {@link #RESULT_FAILURE} * @return {@link #RESULT_SUCCESS} or {@link #RESULT_FAILURE}
* @hide * @hide
*/ */
@SystemApi
public abstract int scheduleAsPackage(JobInfo job, String packageName, int userId, String tag); public abstract int scheduleAsPackage(JobInfo job, String packageName, int userId, String tag);
/** /**