diff options
| author | Michael Wright <michaelwr@google.com> | 2017-05-11 16:27:31 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-05-11 16:27:31 +0000 |
| commit | 4bfb604d043058b0ce95234319fd872124c5ec11 (patch) | |
| tree | 29d3c8722d4f45b48e120e354d359f2835005245 | |
| parent | bcee3cc3fa57263cf253dd652e4d90c030c49b5a (diff) | |
| parent | ed06122ee73e9aa4c8498191fecf03bb92a7712e (diff) | |
Merge "Avoid NPE when getting last shutdown reason." into oc-dev am: 0cf6b908a8
am: ed06122ee7
Change-Id: I8c215a63d34938e02f0ab1fca3b746e1705d6eec
| -rw-r--r-- | services/core/java/com/android/server/power/PowerManagerService.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/power/PowerManagerService.java b/services/core/java/com/android/server/power/PowerManagerService.java index 423bc0cc7884..a8d19e94dea5 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 @@ 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; |