summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorJean-Michel Trivi <jmtrivi@google.com>2017-10-11 22:28:57 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-10-11 22:28:57 +0000
commit900699c173e3da89329a3bd1f10fa10d705da4e7 (patch)
tree6c43655205c2af2477a09dcf16feb5ffc4b3d986 /core/java
parente8af749eece0521db3d4b7465bbca4169b4a9deb (diff)
parentfd77afd548753d8f9e1546ae30788fc86529cdbd (diff)
Merge "Merge "Fix alarm preview volume" into oc-mr1-dev am: b9629cd432" into oc-mr1-dev-plus-aosp
am: fd77afd548 Change-Id: I9ed6b346f9f81a338169628d9e2c955421560744
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/preference/SeekBarVolumizer.java3
1 files changed, 1 insertions, 2 deletions
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) {