From d51d398383c99aa0e1c84e46aafa593006d5120d Mon Sep 17 00:00:00 2001 From: Jean-Michel Trivi Date: Tue, 10 Oct 2017 16:32:38 -0700 Subject: Fix alarm preview volume SeekBarVolumizer: do not use FLAG_BYPASS_INTERRUPTION_POLICY as there is no need to bypass DnD modes in seek bar for volume since they are disabled according to the DnD mode. AudioService (PlaybackActivityMonitor): check both AudioAttributes flags BYPASS_INTERRUPTION_POLICY and BYPASS_MUTE for forced alarm playback (see b/63617557). Test: see bug Bug: 67578783 Change-Id: Iaf43f16d96d1ad8a1eacc73a050db767004ba96b --- core/java/android/preference/SeekBarVolumizer.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'core/java') diff --git a/core/java/android/preference/SeekBarVolumizer.java b/core/java/android/preference/SeekBarVolumizer.java index ee8eed1906f4..3d2e1d1f1d24 100644 --- a/core/java/android/preference/SeekBarVolumizer.java +++ b/core/java/android/preference/SeekBarVolumizer.java @@ -206,8 +206,7 @@ public class SeekBarVolumizer implements OnSeekBarChangeListener, Handler.Callba try { mRingtone.setAudioAttributes(new AudioAttributes.Builder(mRingtone .getAudioAttributes()) - .setFlags(AudioAttributes.FLAG_BYPASS_INTERRUPTION_POLICY | - AudioAttributes.FLAG_BYPASS_MUTE) + .setFlags(AudioAttributes.FLAG_BYPASS_MUTE) .build()); mRingtone.play(); } catch (Throwable e) { -- cgit v1.2.3