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

Commit da3f63ff authored by Tao Bao's avatar Tao Bao Committed by Android (Google) Code Review
Browse files

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

parents 7c3185e0 983d449a

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

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

        }