am da3f63ff: Merge "Fix the NPE when checking mRebootReason" into mnc-dev

* commit 'da3f63ffb87397943546a7c5c893ce98f2489df2': Fix the NPE when checking mRebootReason
2015-06-02 19:42:53 +00:00
parent 9ba15d9f88 da3f63ffb8
commit b8b93c1b79
1 changed files with 1 additions and 1 deletions
--- 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();
        }