summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--media/java/android/media/AudioService.java6
1 files changed, 2 insertions, 4 deletions
diff --git a/media/java/android/media/AudioService.java b/media/java/android/media/AudioService.java
index 45497e9..87ccaaf 100644
--- 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;