Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 12fae936 authored by Chet Haase's avatar Chet Haase Committed by Android (Google) Code Review
Browse files

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

parents 85e08624 86b300c3

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

+4 −1
Original line number Diff line number Diff line
@@ -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);