Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a32efedd authored by Daniel Sandler's avatar Daniel Sandler Committed by Android Git Automerger
Browse files

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

Merge commit 'de3601e0' into kraken

* commit 'de3601e0':
  Honor the "Never vibrate" setting for incoming calls.
parents 8dc634e8 de3601e0

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;