am 33476b2d: am feebaf35: Merge "Don\'t crash on null Vibrator during reboot." into gingerbread

Merge commit '33476b2db82b5a7f025eb9625fa56f94290e97f4' * commit '33476b2db82b5a7f025eb9625fa56f94290e97f4': Don't crash on null Vibrator during reboot.
2010-10-16 09:13:39 -07:00
parent c52862edcf 33476b2db8
commit da3fe88b2d
2 changed files with 21 additions and 3 deletions
--- a/core/java/com/android/internal/app/ShutdownThread.java
+++ b/core/java/com/android/internal/app/ShutdownThread.java
@@ -413,7 +413,7 @@ public final class ShutdownThread extends Thread {
            // vibrator is asynchronous so we need to wait to avoid shutting down too soon.
            try {
                Thread.sleep(SHUTDOWN_VIBRATE_MS);
-            } catch (InterruptedException e) {
+            } catch (InterruptedException unused) {
            }
        }