commit 12fae936dbf7e8642f5c15c7b40a46f62c7d9624
author Chet Haase <chet@google.com> Fri Jul 22 20:45:49 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 22 20:45:50 2016 +0000
tree 158232d9c59d67a04de482b339431cb64dee2361
parent 85e086248df1e8362694c276c428c09796335572
parent 86b300c3747b04cd6bca3ef9e3b46bc395b3559a

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

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

diff --git a/services/core/java/com/android/server/job/JobPackageTracker.java b/services/core/java/com/android/server/job/JobPackageTracker.java
index ba96b74..82e2eb4 100644
--- a/services/core/java/com/android/server/job/JobPackageTracker.java
+++ b/services/core/java/com/android/server/job/JobPackageTracker.java
@@ -395,7 +395,10 @@
             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);