Don't play a sound if a volume key press is canceled. (8b7a982d) · Commits · e / os / android_frameworks_base

policy/src/com/android/internal/policy/impl/PhoneWindow.java

+14 −12

Original line number	Original line	Diff line number	Diff line
	@@ -1317,6 +1317,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
	switch (keyCode) {		switch (keyCode) {
	case KeyEvent.KEYCODE_VOLUME_UP:		case KeyEvent.KEYCODE_VOLUME_UP:
	case KeyEvent.KEYCODE_VOLUME_DOWN: {		case KeyEvent.KEYCODE_VOLUME_DOWN: {
			if (!event.isCanceled()) {
	AudioManager audioManager = (AudioManager) getContext().getSystemService(		AudioManager audioManager = (AudioManager) getContext().getSystemService(
	Context.AUDIO_SERVICE);		Context.AUDIO_SERVICE);
	if (audioManager != null) {		if (audioManager != null) {
	@@ -1330,6 +1331,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
	AudioManager.FLAG_PLAY_SOUND);		AudioManager.FLAG_PLAY_SOUND);
	mVolumeKeyUpTime = SystemClock.uptimeMillis();		mVolumeKeyUpTime = SystemClock.uptimeMillis();
	}		}
			}
	return true;		return true;
	}		}