From 9bb765448df43d41e0a3edb7de1d1641c9251c35 Mon Sep 17 00:00:00 2001 From: Guang Zhu Date: Thu, 28 May 2015 20:50:03 -0700 Subject: [PATCH] fix NPE in shutdown thread null reboot reason is used when it's a simple reboot. Change-Id: I9d3110ca733a1b0401721fde907924c101997c4f --- 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 85dd9d4c0b41c..e5981fb99c07a 100644 --- a/services/core/java/com/android/server/power/ShutdownThread.java +++ b/services/core/java/com/android/server/power/ShutdownThread.java @@ -238,7 +238,7 @@ public final class ShutdownThread extends Thread { // throw up an indeterminate system dialog to indicate radio is // shutting down. ProgressDialog pd = new ProgressDialog(context); - if (mRebootReason.equals(PowerManager.REBOOT_RECOVERY)) { + if (PowerManager.REBOOT_RECOVERY.equals(mRebootReason)) { pd.setTitle(context.getText(com.android.internal.R.string.reboot_to_recovery_title)); } else { pd.setTitle(context.getText(com.android.internal.R.string.power_off));