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

Merge "Fix FLAG_EXEMPT_FROM_APP_STANDBY check"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-02-12 21:53:48 +00:00
committed by Android (Google) Code Review
parent 9d82216abc 2b5811af2c
commit 72fa42bee3
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -365,9 +365,7 @@ public class JobInfo implements Parcelable {
/** @hide */
public boolean isExemptedFromAppStandby() {
return ((flags & FLAG_EXEMPT_FROM_APP_STANDBY) != 0)
&& !hasEarlyConstraint()
&& !hasLateConstraint();
return ((flags & FLAG_EXEMPT_FROM_APP_STANDBY) != 0) && !isPeriodic();
}
/**

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

@@ -2337,9 +2337,9 @@ public final class JobSchedulerService extends com.android.server.SystemService
if (callingUid != Process.SYSTEM_UID) {
throw new SecurityException("Job has invalid flags");
}
if (job.hasLateConstraint() || job.hasEarlyConstraint()) {
Slog.wtf(TAG, "Jobs with time-constraints mustn't have"
+" FLAG_EXEMPT_FROM_APP_STANDBY. Job=" + job);
if (job.isPeriodic()) {
Slog.wtf(TAG, "Periodic jobs mustn't have"
+ " FLAG_EXEMPT_FROM_APP_STANDBY. Job=" + job);
}
}
}