summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Michael Wachenschwanz <mwachens@google.com> 2018-07-19 12:02:19 -0700
committer Michael Wachenschwanz <mwachens@google.com> 2018-07-19 12:02:19 -0700
commitbc9abc6589d26984690434feaa622b566c4ecbe1 (patch)
tree5f0897d07a23dc8fef3b49a3a65a54ef66e93ce6
parente4c818f44045ceb57b090de46a750f2459bc0a53 (diff)
Add null check for LastEvent in UserUsageStatsService
Change-Id: Ie57233ccb23f1399234b1dbb6ae490de9595e71f Fixes: 111630625 Test: manual
-rw-r--r--services/usage/java/com/android/server/usage/UserUsageStatsService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/usage/java/com/android/server/usage/UserUsageStatsService.java b/services/usage/java/com/android/server/usage/UserUsageStatsService.java
index b5d785fc1589..ad6ddc60ead1 100644
--- a/services/usage/java/com/android/server/usage/UserUsageStatsService.java
+++ b/services/usage/java/com/android/server/usage/UserUsageStatsService.java
@@ -314,7 +314,7 @@ class UserUsageStatsService {
// STOPSHIP: Temporary logging for b/110930764.
if (intervalType == UsageStatsManager.INTERVAL_DAILY
- && mLastEvent.mTimeStamp >= beginTime) {
+ && mLastEvent != null && mLastEvent.mTimeStamp >= beginTime) {
final IntervalStats diskStats = mDatabase.getLatestUsageStats(
UsageStatsManager.INTERVAL_DAILY);
StringBuilder sb = new StringBuilder(256);