commit 6fc3afab86f936e31e1ab7339af97115dfbee2c0
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Feb 23 20:42:04 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Feb 23 20:42:04 2018 +0000
tree 863723b8c00f6876fbfca465530ea87337e6d79a
parent 647cd776c3b35bae0fbe2adabf246cdb735bf8d1
parent 74e9ad1531dde1b0799ffbdd10330a0a6021dcd6

Merge "Supports legacy stream type in getUsagesForVolumeGroupId"

service/src/com/android/car/UptimeTracker.java

diff --git a/service/src/com/android/car/UptimeTracker.java b/service/src/com/android/car/UptimeTracker.java
index 2a1d26e..1709965 100644
--- a/service/src/com/android/car/UptimeTracker.java
+++ b/service/src/com/android/car/UptimeTracker.java
@@ -145,7 +145,7 @@
     }
 
     private long getHistoricalUptimeLocked() {
-        if (!mHistoricalUptime.isPresent() && mUptimeFile != null) {
+        if (!mHistoricalUptime.isPresent() && mUptimeFile != null && mUptimeFile.exists()) {
             try {
                 JsonReader reader = new JsonReader(new FileReader(mUptimeFile));
                 reader.beginObject();