commit e55f195a98e7ba489d952034fced1b5aa703035b
author Tao Bao <tbao@google.com> Tue Jun 02 21:10:01 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Jun 02 21:10:01 2015 +0000
tree 377b7d0815b227f7779e4bd085e72b58704d6818
parent 34de1db18c5aac578f9cdd7c31465a86b960044e
parent b8b93c1b79ab7233e054425bd917a014159e7f7d

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

* commit 'b8b93c1b79ab7233e054425bd917a014159e7f7d':
  Fix the NPE when checking mRebootReason

services/core/java/com/android/server/power/ShutdownThread.java

diff --git a/services/core/java/com/android/server/power/ShutdownThread.java b/services/core/java/com/android/server/power/ShutdownThread.java
index e5981fb..4b62c40 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 @@
         }
 
         // 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();
         }