Honor the "Never vibrate" setting for incoming calls.

Bug: 2579295
Change-Id: Ia4207492c5dfa2c39d27372c4892b60121b6d9e8

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
+                // return false, even for incoming calls
-                if (vibrateType == AudioManager.VIBRATE_TYPE_RINGER) {
+                return false;
-                    return mRingerMode == AudioManager.RINGER_MODE_VIBRATE;
-                }
 
             default:
                 return false;