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

Commit cfdd0225 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add null check in usagestats dump"

parents 16b989fc 78646e58

services/usage/java/com/android/server/usage/UserUsageStatsService.java

+7 −5
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ import java.util.List; 
class UserUsageStatsService {

    private static final String TAG = "UsageStatsService";

    private static final boolean DEBUG = UsageStatsService.DEBUG;

    private static final SimpleDateFormat sDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

    private static final SimpleDateFormat sDateFormat = new SimpleDateFormat("yyyy-MM-dd/HH:mm:ss");

    private static final int sDateFormatFlags =

            DateUtils.FORMAT_SHOW_DATE

            | DateUtils.FORMAT_SHOW_TIME
@@ -572,12 +572,14 @@ class UserUsageStatsService { 
            pw.printPair("endTime", endTime);

        }

        pw.println(")");

        if (events != null) {

            pw.increaseIndent();

            for (UsageEvents.Event event : events) {

                printEvent(pw, event, prettyDates);

            }

            pw.decreaseIndent();

        }

    }



    void printIntervalStats(IndentingPrintWriter pw, IntervalStats stats,

            boolean checkin, String pkg) {