Merge "Log SystemServerShutdown earlier" into oc-mr1-dev (70aa7bbc) · Commits · e / os / android_frameworks_base

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