From 78646e58a30d2230f26e04fe4ec21939dd3301a3 Mon Sep 17 00:00:00 2001 From: Michael Wachenschwanz Date: Tue, 27 Feb 2018 15:54:27 -0800 Subject: [PATCH] Add null check in usagestats dump (also adjust the time stamp for easier parsing) Change-Id: I708c9fe68aa85b4897e95cca6b9d53522eef0d29 Fixes: 73960916 Test: manual --- .../android/server/usage/UserUsageStatsService.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/services/usage/java/com/android/server/usage/UserUsageStatsService.java b/services/usage/java/com/android/server/usage/UserUsageStatsService.java index 3fbcd8116d9d9..7f060b3093e90 100644 --- a/services/usage/java/com/android/server/usage/UserUsageStatsService.java +++ b/services/usage/java/com/android/server/usage/UserUsageStatsService.java @@ -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,11 +572,13 @@ class UserUsageStatsService { pw.printPair("endTime", endTime); } pw.println(")"); - pw.increaseIndent(); - for (UsageEvents.Event event : events) { - printEvent(pw, event, prettyDates); + if (events != null) { + pw.increaseIndent(); + for (UsageEvents.Event event : events) { + printEvent(pw, event, prettyDates); + } + pw.decreaseIndent(); } - pw.decreaseIndent(); } void printIntervalStats(IndentingPrintWriter pw, IntervalStats stats,