From bc9abc6589d26984690434feaa622b566c4ecbe1 Mon Sep 17 00:00:00 2001
From: Michael Wachenschwanz <mwachens@google.com>
Date: Thu, 19 Jul 2018 12:02:19 -0700
Subject: Add null check for LastEvent in UserUsageStatsService

Change-Id: Ie57233ccb23f1399234b1dbb6ae490de9595e71f
Fixes: 111630625
Test: manual
---
 services/usage/java/com/android/server/usage/UserUsageStatsService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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);
-- 
cgit v1.2.3-59-g8ed1b