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

Commit 5a67749a authored Oct 19, 2010 by Brad Fitzpatrick Committed by Android Git Automerger Oct 19, 2010

am 987e8d7f: Merge "Fix Vibrator permission CTS test broken earlier." into gingerbread

Merge commit '987e8d7f' into gingerbread-plus-aosp

* commit '987e8d7f':
  Fix Vibrator permission CTS test broken earlier.

parents a30c8835 987e8d7f

core/java/android/os/Vibrator.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -50,7 +50,7 @@ public class Vibrator
		}
		try {
		mService.vibrate(milliseconds, mToken);
		} catch (Exception e) {
		} catch (RemoteException e) {
		Log.w(TAG, "Failed to vibrate.", e);
		}
		}
		@@ -80,7 +80,7 @@ public class Vibrator
		if (repeat < pattern.length) {
		try {
		mService.vibratePattern(pattern, repeat, mToken);
		} catch (Exception e) {
		} catch (RemoteException e) {
		Log.w(TAG, "Failed to vibrate.", e);
		}
		} else {

core/java/com/android/internal/app/ShutdownThread.java

+7 −1

Original line number	Diff line number	Diff line
		@@ -377,7 +377,13 @@ public final class ShutdownThread extends Thread {
		} else if (SHUTDOWN_VIBRATE_MS > 0) {
		// vibrate before shutting down
		Vibrator vibrator = new Vibrator();
		try {
		vibrator.vibrate(SHUTDOWN_VIBRATE_MS);
		} catch (Exception e) {
		// Failure to vibrate shouldn't interrupt shutdown. Just log it.
		Log.w(TAG, "Failed to vibrate during shutdown.", e);
		}

		// vibrator is asynchronous so we need to wait to avoid shutting down too soon.
		try {
		Thread.sleep(SHUTDOWN_VIBRATE_MS);