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

Commit b4b5c28c authored by John Spurlock's avatar John Spurlock Committed by Android Git Automerger
Browse files

am 9cfdb4f6: am 967e19a4: am 2f47eaff: Merge "Volume: Only play the new... 

am 9cfdb4f6: am 967e19a4: am 2f47eaff: Merge "Volume: Only play the new vibrate hint once per volume-down." into lmp-mr1-dev

* commit '9cfdb4f6':
  Volume: Only play the new vibrate hint once per volume-down.
parents 596b70f9 9cfdb4f6

media/java/android/media/AudioService.java

+6 −5
Original line number Diff line number Diff line
@@ -3110,12 +3110,13 @@ public class AudioService extends IAudioService.Stub { 
                break;

            }

            if ((direction == AudioManager.ADJUST_LOWER)) {

                if (VOLUME_SETS_RINGER_MODE_SILENT

                        && mPrevVolDirection != AudioManager.ADJUST_LOWER) {

                if (mPrevVolDirection != AudioManager.ADJUST_LOWER) {

                    if (VOLUME_SETS_RINGER_MODE_SILENT) {

                        ringerMode = RINGER_MODE_SILENT;

                    } else {

                        result |= AudioManager.FLAG_SHOW_VIBRATE_HINT;

                    }

                }

            } else if (direction == AudioManager.ADJUST_RAISE) {

                ringerMode = RINGER_MODE_NORMAL;

            }