am cd3f349f: am a32efedd: am de3601e0: am bcac4960: Honor the "Never vibrate"... (57e6f58b) · Commits · e / os / android_frameworks_base

media/java/android/media/AudioService.java

+2 −4

Original line number	Diff line number	Diff line
		@@ -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;