am df7f02b6: am ad61b833: Merge "Fix no vibration during shutdown." (b1ce9b9c) · Commits · e / os / android_frameworks_base

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

+5 −4

Original line number	Diff line number	Diff line
		@@ -390,7 +390,7 @@ public final class ShutdownThread extends Thread {
		}
		}

		rebootOrShutdown(mReboot, mRebootReason);
		rebootOrShutdown(mContext, mReboot, mRebootReason);
		}

		private void shutdownRadios(int timeout) {
		@@ -507,17 +507,18 @@ public final class ShutdownThread extends Thread {
		* Do not call this directly. Use {@link #reboot(Context, String, boolean)}
		* or {@link #shutdown(Context, boolean)} instead.
		*
		* @param context Context used to vibrate or null without vibration
		* @param reboot true to reboot or false to shutdown
		* @param reason reason for reboot
		*/
		public static void rebootOrShutdown(boolean reboot, String reason) {
		public static void rebootOrShutdown(final Context context, boolean reboot, String reason) {
		if (reboot) {
		Log.i(TAG, "Rebooting, reason: " + reason);
		PowerManagerService.lowLevelReboot(reason);
		Log.e(TAG, "Reboot failed, will attempt shutdown instead");
		} else if (SHUTDOWN_VIBRATE_MS > 0) {
		} else if (SHUTDOWN_VIBRATE_MS > 0 && context != null) {
		// vibrate before shutting down
		Vibrator vibrator = new SystemVibrator();
		Vibrator vibrator = new SystemVibrator(context);
		try {
		vibrator.vibrate(SHUTDOWN_VIBRATE_MS, VIBRATION_ATTRIBUTES);
		} catch (Exception e) {

+1 −1

Original line number	Diff line number	Diff line
		@@ -285,7 +285,7 @@ public final class SystemServer {
		reason = null;
		}

		ShutdownThread.rebootOrShutdown(reboot, reason);
		ShutdownThread.rebootOrShutdown(null, reboot, reason);
		}
		}