Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Merge commit 'de3601e05cf551e24eee50d4c1e70b5037792679' into kraken

* commit 'de3601e05cf551e24eee50d4c1e70b5037792679':
  Honor the "Never vibrate" setting for incoming calls.
This commit is contained in:
Daniel Sandler
2010-04-13 11:53:30 -07:00
committed by Android Git Automerger
parent 8dc634e82f de3601e05c
commit a32efedd26
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
media/java/android/media/AudioService.java
View File

@@ -601,10 +601,8 @@ public class AudioService extends IAudioService.Stub {
return mRingerMode == AudioManager.RINGER_MODE_VIBRATE; return mRingerMode == AudioManager.RINGER_MODE_VIBRATE;
case AudioManager.VIBRATE_SETTING_OFF: case AudioManager.VIBRATE_SETTING_OFF:
// Phone ringer should always vibrate in vibrate mode // return false, even for incoming calls
if (vibrateType == AudioManager.VIBRATE_TYPE_RINGER) { return false;
return mRingerMode == AudioManager.RINGER_MODE_VIBRATE;
}
default: default:
return false; return false;