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

core/java/android/app/job/JobInfo.java

@@ -165,6 +165,9 @@ public class JobInfo implements Parcelable {
      * network restrictions for the requesting app. Note that this flag alone
      * doesn't actually place your {@link JobService} in the foreground; you
      * 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
      */

services/core/java/com/android/server/job/JobSchedulerService.java

@@ -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();
             try {
                 return JobSchedulerService.this.schedule(job, uid);