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

Commit 987e8d7f authored Oct 19, 2010 by Brad Fitzpatrick Committed by Android (Google) Code Review Oct 19, 2010

Merge "Fix Vibrator permission CTS test broken earlier." into gingerbread

parents 18580319 26e9cf38

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
		@@ -360,7 +360,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);