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

Commit 22f95644 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "services: Fix device-specific shutdown hook to support restart"

parents cbf35241 bfc1b8eb

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

+3 −3
Original line number Diff line number Diff line
@@ -524,6 +524,9 @@ public final class ShutdownThread extends Thread { 
     * @param reason reason for reboot

     */

    public static void rebootOrShutdown(boolean reboot, String reason) {

        // Oem specific shutdown

        deviceRebootOrShutdown(reboot, reason);



        if (reboot) {

            Log.i(TAG, "Rebooting, reason: " + reason);

            PowerManagerService.lowLevelReboot(reason);
@@ -545,9 +548,6 @@ public final class ShutdownThread extends Thread { 
            }

        }



        // Oem specific shutdown

        deviceRebootOrShutdown(reboot, reason);



        // Shutdown power

        Log.i(TAG, "Performing low-level shutdown...");

        PowerManagerService.lowLevelShutdown();