OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8414c67
5db0908
)
Merge "Added priority to JobScheduler scheduling"
author
Shreyas Basarge
<snb@google.com>
Fri, 15 Jan 2016 13:54:08 +0000
(13:54 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Fri, 15 Jan 2016 13:54:08 +0000
(13:54 +0000)
1
2
core/java/android/app/job/JobInfo.java
patch
|
diff1
|
diff2
|
blob
|
history
services/core/java/com/android/server/job/JobSchedulerService.java
patch
|
diff1
|
diff2
|
blob
|
history
services/core/java/com/android/server/job/JobStore.java
patch
|
diff1
|
diff2
|
blob
|
history
services/core/java/com/android/server/job/controllers/JobStatus.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
core/java/android/app/job/JobInfo.java
index
b899710
,
5aa4f79
..
9ad35d4
---
1
/
core/java/android/app/job/JobInfo.java
---
2
/
core/java/android/app/job/JobInfo.java
+++ b/
core/java/android/app/job/JobInfo.java
@@@
-88,9
-83,9
+88,10
@@@
public class JobInfo implements Parcela
private final boolean isPeriodic;
private final boolean isPersisted;
private final long intervalMillis;
+ private final long flexMillis;
private final long initialBackoffMillis;
private final int backoffPolicy;
+ private final int priority;
/**
* Unique job id associated with this class. This is assigned to your job by the scheduler.
diff --cc
services/core/java/com/android/server/job/JobSchedulerService.java
Simple merge
diff --cc
services/core/java/com/android/server/job/JobStore.java
Simple merge
diff --cc
services/core/java/com/android/server/job/controllers/JobStatus.java
Simple merge