Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e4227915 authored by Guang Zhu's avatar Guang Zhu
Browse files

fix NPE in shutdown thread 

null reboot reason is used when it's a simple reboot.

Change-Id: I9d3110ca733a1b0401721fde907924c101997c4f
(cherry picked from commit 9bb76544)
parent 3aa76940

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

+1 −1
Original line number Diff line number Diff line
@@ -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));