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

Commit 454fbc8c authored by Fyodor Kupolov's avatar Fyodor Kupolov Committed by android-build-merger
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
am: cb1bf89e

Change-Id: Ieb7dff7d7f397960ccee9daf52d723f657378f26
parents 76344358 cb1bf89e

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);