summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2017-10-12 07:21:51 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2017-10-12 07:21:51 +0000
commit09b8d37e7b42b87fa6f8bd47e2e26b5c268590b8 (patch)
tree6edc6ac500e49d2069cfe63f5cb495e976a843aa
parent245cd751648787ee973e21dd3aeee6eb6495002d (diff)
parent7b835ec1d91858ec2e3b6508e77b4ac6807e9248 (diff)
downloadandroid_packages_apps_CellBroadcastReceiver-09b8d37e7b42b87fa6f8bd47e2e26b5c268590b8.tar.gz
android_packages_apps_CellBroadcastReceiver-09b8d37e7b42b87fa6f8bd47e2e26b5c268590b8.tar.bz2
android_packages_apps_CellBroadcastReceiver-09b8d37e7b42b87fa6f8bd47e2e26b5c268590b8.zip
Snap for 4391495 from 7b835ec1d91858ec2e3b6508e77b4ac6807e9248 to oc-mr1-release
Change-Id: I23348accff726192917ff9292515cf3d0b117812
-rw-r--r--src/com/android/cellbroadcastreceiver/CellBroadcastAlertAudio.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertAudio.java b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertAudio.java
index 75e0e052..fe75c968 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertAudio.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertAudio.java
@@ -531,9 +531,10 @@ public class CellBroadcastAlertAudio extends Service implements TextToSpeech.OnI
builder.setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION);
builder.setUsage(AudioAttributes.USAGE_ALARM);
if (mUseFullVolume) {
- // Set FLAG_BYPASS_INTERRUPTION_POLICY so that it still enables
- // audio in DnD mode (except total silence DnD mode).
- builder.setFlags(AudioAttributes.FLAG_BYPASS_INTERRUPTION_POLICY);
+ // Set FLAG_BYPASS_INTERRUPTION_POLICY and FLAG_BYPASS_MUTE so that it enables
+ // audio in any DnD mode, even in total silence DnD mode (requires MODIFY_PHONE_STATE).
+ builder.setFlags(AudioAttributes.FLAG_BYPASS_INTERRUPTION_POLICY
+ | AudioAttributes.FLAG_BYPASS_MUTE);
}
mMediaPlayer.setAudioAttributes(builder.build());