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

2015-06-02 19:17:52 +00:00
parent 7c3185e0b4 983d449a84
commit da3f63ffb8
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();
        }