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

Merge "Fix NPE in JobPackageTracker" into nyc-mr1-dev

Browse Source
This commit is contained in:
Chet Haase
2016-07-22 20:45:49 +00:00
committed by Android (Google) Code Review
parent 85e086248d 86b300c374
commit 12fae936db
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -395,7 +395,10 @@ public final class JobPackageTracker {
return 0;
}
final long now = SystemClock.uptimeMillis();
long time = cur.getActiveTime(now) + cur.getPendingTime(now);
long time = 0;
if (cur != null) {
time += cur.getActiveTime(now) + cur.getPendingTime(now);
}
long period = mCurDataSet.getTotalTime(now);
if (last != null) {
time += last.getActiveTime(now) + last.getPendingTime(now);