commit 6f9ee6ecade42ba1a8f1a149037d1174ed39df20
author Daniel Sandler <dsandler@android.com> Fri Apr 30 11:30:12 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Apr 30 11:30:12 2010 -0700
tree e25599ac8fe958e64d9c9333f0c17a20559c749a
parent 4eed4048cb101fd3225d3c4fc23489205b65e9da
parent b8a24bdd9e702d7cad6bf5eb9ac2e1cd923c0816

am b8a24bdd: Merge "Update CTS to reflect recent vibration fixes." into froyo

Merge commit 'b8a24bdd9e702d7cad6bf5eb9ac2e1cd923c0816' into froyo-plus-aosp

* commit 'b8a24bdd9e702d7cad6bf5eb9ac2e1cd923c0816':
  Update CTS to reflect recent vibration fixes.

tests/tests/media/src/android/media/cts/AudioManagerTest.java

diff --git a/tests/tests/media/src/android/media/cts/AudioManagerTest.java b/tests/tests/media/src/android/media/cts/AudioManagerTest.java
index 6b1f24c..3558fa3 100644
--- a/tests/tests/media/src/android/media/cts/AudioManagerTest.java
+++ b/tests/tests/media/src/android/media/cts/AudioManagerTest.java
@@ -436,7 +436,10 @@
 
         mAudioManager.setRingerMode(RINGER_MODE_VIBRATE);
         assertEquals(RINGER_MODE_VIBRATE, mAudioManager.getRingerMode());
-        assertTrue(mAudioManager.shouldVibrate(VIBRATE_TYPE_RINGER));
+        // Note: as of Froyo, if VIBRATE_TYPE_RINGER is set to OFF, it will
+        // not vibrate, even in RINGER_MODE_VIBRATE. This allows users to
+        // disable the vibration for incoming calls only.
+        assertFalse(mAudioManager.shouldVibrate(VIBRATE_TYPE_RINGER));
 
         // VIBRATE_SETTING_ONLY_SILENT
         mAudioManager.setVibrateSetting(VIBRATE_TYPE_RINGER, VIBRATE_SETTING_ONLY_SILENT);