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

Commit cb1bf89e authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Log SystemServerShutdown earlier" into oc-mr1-dev am:... 

Merge "Merge "Log SystemServerShutdown earlier" into oc-mr1-dev am: 70aa7bbc" into oc-mr1-dev-plus-aosp
parents 839a419b 473f1c4f

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

+1 −1
Original line number Diff line number Diff line
@@ -715,6 +715,7 @@ public final class ShutdownThread extends Thread { 
     * @param reason reason for reboot/shutdown

     */

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

        SHUTDOWN_TIMINGS_LOG.traceEnd(); // SystemServerShutdown

        if (reboot) {

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

            PowerManagerService.lowLevelReboot(reason);
@@ -736,7 +737,6 @@ public final class ShutdownThread extends Thread { 
            } catch (InterruptedException unused) {

            }

        }

        SHUTDOWN_TIMINGS_LOG.traceEnd(); // SystemServerShutdown

        // Shutdown power

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

        PowerManagerService.lowLevelShutdown(reason);