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

Merge "Require permission for FLAG_WILL_BE_FOREGROUND." into nyc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-07-14 20:05:37 +00:00
committed by Android (Google) Code Review
parent 5ac1b52aaa 785f494e87
commit 97639a1310
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/app/job/JobInfo.java
View File

@@ -165,6 +165,9 @@ public class JobInfo implements Parcelable {
* network restrictions for the requesting app. Note that this flag alone * network restrictions for the requesting app. Note that this flag alone
* doesn't actually place your {@link JobService} in the foreground; you * doesn't actually place your {@link JobService} in the foreground; you
* still need to post the notification yourself. * still need to post the notification yourself.
* <p>
* To use this flag, the caller must hold the
* {@link android.Manifest.permission#CONNECTIVITY_INTERNAL} permission.
* *
* @hide * @hide
*/ */

5
services/core/java/com/android/server/job/JobSchedulerService.java
View File

@@ -1556,6 +1556,11 @@ public final class JobSchedulerService extends com.android.server.SystemService
} }
} }
if ((job.getFlags() & JobInfo.FLAG_WILL_BE_FOREGROUND) != 0) {
getContext().enforceCallingOrSelfPermission(
android.Manifest.permission.CONNECTIVITY_INTERNAL, TAG);
}
long ident = Binder.clearCallingIdentity(); long ident = Binder.clearCallingIdentity();
try { try {
return JobSchedulerService.this.schedule(job, uid); return JobSchedulerService.this.schedule(job, uid);