From 983d449a84b6040e15368da925149419fc6b7010 Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Tue, 2 Jun 2015 12:12:53 -0700 Subject: [PATCH] Fix the NPE when checking mRebootReason Bug: 21584198 Change-Id: Ie11092dbc771b54bd049d258dc705835a3eda494 --- services/core/java/com/android/server/power/ShutdownThread.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/power/ShutdownThread.java b/services/core/java/com/android/server/power/ShutdownThread.java index e5981fb99c07a..4b62c401fc729 100644 --- a/services/core/java/com/android/server/power/ShutdownThread.java +++ b/services/core/java/com/android/server/power/ShutdownThread.java @@ -408,7 +408,7 @@ public final class ShutdownThread extends Thread { } // If it's to reboot into recovery, invoke uncrypt via init service. - if (mRebootReason.equals(PowerManager.REBOOT_RECOVERY)) { + if (PowerManager.REBOOT_RECOVERY.equals(mRebootReason)) { uncrypt(); }