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

Commit 49b41328 authored by Fyodor Kupolov's avatar Fyodor Kupolov
Browse files

Log SystemServerShutdown earlier 

Otherwise it wouldn't get logged in the reboot case.

Test: adb shell svc power reboot
Bug: 64569080
Change-Id: Ib69bb78f682847fbdf9735bdee9cc8406e491463
parent 144d8cb6

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