commit 0cf6b908a806a354c9745a91a7b19e4148a98489
author TreeHugger Robot <treehugger-gerrit@google.com> Thu May 11 15:54:12 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 11 15:54:17 2017 +0000
tree 575b7160949773c3098a102a86d394da4e2a61b9
parent 6c34dd58f6d25eaf75e084f5a21e50c0bd80a7df
parent 9199d0c1ffed3ff3e10c3e20fd7efad10798dc9a

Merge "Avoid NPE when getting last shutdown reason." into oc-dev

services/core/java/com/android/server/power/PowerManagerService.java

diff --git a/services/core/java/com/android/server/power/PowerManagerService.java b/services/core/java/com/android/server/power/PowerManagerService.java
index 423bc0c..a8d19e9 100644
--- a/services/core/java/com/android/server/power/PowerManagerService.java
+++ b/services/core/java/com/android/server/power/PowerManagerService.java
@@ -4607,6 +4607,9 @@
         } catch (IOException e) {
             Slog.e(TAG, "Failed to read last_reboot_reason file", e);
         }
+        if (line == null) {
+            return PowerManager.SHUTDOWN_REASON_UNKNOWN;
+        }
         switch (line) {
             case REASON_SHUTDOWN:
                 return PowerManager.SHUTDOWN_REASON_SHUTDOWN;