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

Merge "Add null check in usagestats dump"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-02-28 04:20:44 +00:00
committed by Android (Google) Code Review
parent 16b989fc0e 78646e58a3
commit cfdd02255e
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/usage/java/com/android/server/usage/UserUsageStatsService.java
View File

@@ -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,