am cd3f349f: am a32efedd: am de3601e0: am bcac4960: Honor the "Never vibrate" setting for incoming calls.

2010-04-13 16:24:16 -07:00
parent 16bd9372ee cd3f349f32
commit 57e6f58bb7
1 changed files with 2 additions and 4 deletions
--- a/media/java/android/media/AudioService.java
+++ b/media/java/android/media/AudioService.java
@@ -601,10 +601,8 @@ public class AudioService extends IAudioService.Stub {
                return mRingerMode == AudioManager.RINGER_MODE_VIBRATE;

            case AudioManager.VIBRATE_SETTING_OFF:
-                // Phone ringer should always vibrate in vibrate mode
-                if (vibrateType == AudioManager.VIBRATE_TYPE_RINGER) {
-                    return mRingerMode == AudioManager.RINGER_MODE_VIBRATE;
-                }
+                // return false, even for incoming calls
+                return false;

            default:
                return false;