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

am: 0cf6b908a8 Change-Id: Ib31807bddc953d2bba068359c9468257d1b92a9f
2017-05-11 16:04:53 +00:00
parent eccbbe4ca2 0cf6b908a8
commit ed06122ee7
1 changed files with 3 additions and 0 deletions
--- a/services/core/java/com/android/server/power/PowerManagerService.java
+++ b/services/core/java/com/android/server/power/PowerManagerService.java
@@ -4607,6 +4607,9 @@ public final class PowerManagerService extends SystemService
        } 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;