Snap for 5582435 from 7de39616a5c0a06638a700aba8027b2c50919e6a to qt-qpr1-release

Change-Id: I054f044c3f12f3278d1c66db76684a67925f5a85

4 files changed, 11 insertions, 7 deletions

diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 015c8e2bf..c97b74f2c 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -51,7 +51,7 @@
     <string name="emergency_alerts_title" msgid="6605036374197485429">"सूचना"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"प्रसारण मेसेज"</string>
     <string name="notification_channel_emergency_alerts" msgid="5008287980979183617">"आणीबाणीच्या सूचना"</string>
-    <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"सूचनांची अनुमती द्या"</string>
+    <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"सूचनांना अनुमती द्या"</string>
     <string name="enable_alerts_master_toggle_summary" msgid="699552922381916044">"आणीबाणी सूचना मिळवा"</string>
     <string name="alert_reminder_interval_title" msgid="7466642011937564868">"सूचना रिमाइंडरचा आवाज"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"सूचना मेसेज बोला"</string>
@@ -116,7 +116,7 @@
     <string name="delivery_time_heading" msgid="5980836543433619329">"प्राप्त झाले:"</string>
     <string name="notification_multiple" msgid="5121978148152124860">"<xliff:g id="COUNT">%s</xliff:g> न वाचलेल्या सूचना."</string>
     <string name="notification_multiple_title" msgid="1523638925739947855">"नवीन सूचना"</string>
-    <string name="show_cmas_opt_out_summary" msgid="6926059266585295440">"पहिली सूचना (राष्ट्रपतींच्या सूचनेव्यतिरिक्त) प्रदर्शित केल्यानंतर निवड रद्द करा डायलॉग दाखवा."</string>
+    <string name="show_cmas_opt_out_summary" msgid="6926059266585295440">"पहिली सूचना (राष्ट्रपतींच्या सूचनेव्यतिरिक्त) डिस्प्ले केल्यानंतर निवड रद्द करा डायलॉग दाखवा."</string>
     <string name="show_cmas_opt_out_title" msgid="9182104842820171132">"निवड रद्द करा संवाद दर्शवा"</string>
     <string name="cmas_opt_out_dialog_text" msgid="7529010670998259128">"तुम्ही सध्या आणीबाणी सूचना प्राप्त करत आहात. तुम्ही आणीबाणी सूचना प्राप्त करणे सुरु ठेऊ इच्छिता का?"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"होय"</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index fb402f5ed..bd8331715 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -75,7 +75,7 @@
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"అత్యవసర హెచ్చరికలు"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"ప్రాణాంతకమైన సంఘటనల గురించి హెచ్చరించు"</string>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"నెలవారీ పరీక్ష అవసరం"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="588517403520088484">"భద్రతా హెచ్చరిక సిస్టమ్ కోసం పరీక్ష సందేశాలను స్వీకరించండి"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="588517403520088484">"భద్రతా హెచ్చరిక సిస్టమ్ కోసం టెస్ట్‌ సందేశాలను స్వీకరించండి"</string>
     <string name="enable_alert_vibrate_title" msgid="5421032189422312508">"వైబ్రేషన్"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"పూర్తి వాల్యూమ్‌ను ఉపయోగించు"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"ఇతర వాల్యూమ్ మరియు అంతరాయం కలిగించవద్దు ప్రాధాన్యతలను విస్మరిస్తుంది"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 5f687bd59..f8e44343b 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -127,7 +127,7 @@
     <item msgid="9097229303902157183">"2 phút một lần"</item>
     <item msgid="5718214950343391480">"5 phút một lần"</item>
     <item msgid="3863339891188103437">"15 phút một lần"</item>
-    <item msgid="6868848414437854609">"Tắt"</item>
+    <item msgid="6868848414437854609">"Đang tắt"</item>
   </string-array>
     <string name="emergency_alert_settings_title_watches" msgid="4477073412799894883">"Cảnh báo khẩn cấp không dây"</string>
 </resources>
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertAudio.java b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertAudio.java
index ee8db74e2..8d913dfe1 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertAudio.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertAudio.java
@@ -344,7 +344,8 @@ public class CellBroadcastAlertAudio extends Service implements TextToSpeech.OnI
         // stop() checks to see if we are already playing.
         stop();
 
-        log("playAlertTone: alertType=" + alertType);
+        log("playAlertTone: alertType=" + alertType + ", mEnableVibrate=" + mEnableVibrate
+                + ", mEnableAudio=" + mEnableAudio + ", mUseFullVolume=" + mUseFullVolume);
         Resources res =
                 CellBroadcastSettings.getResourcesForDefaultSmsSubscriptionId(
                         getApplicationContext());
@@ -365,10 +366,13 @@ public class CellBroadcastAlertAudio extends Service implements TextToSpeech.OnI
                 vibrateDuration += patternArray[i];
             }
 
-            // Use the alarm channel so it can vibrate in DnD mode, unless alarms are
-            // specifically disabled in DnD.
             AudioAttributes.Builder attrBuilder = new AudioAttributes.Builder();
             attrBuilder.setUsage(AudioAttributes.USAGE_ALARM);
+            if (mUseFullVolume) {
+                // Set the flags to bypass DnD mode if the user enables use full volume option.
+                attrBuilder.setFlags(AudioAttributes.FLAG_BYPASS_INTERRUPTION_POLICY
+                        | AudioAttributes.FLAG_BYPASS_MUTE);
+            }
             AudioAttributes attr = attrBuilder.build();
             // If we only play the tone once, then we also play the vibration pattern once.
             int repeatIndex = (customAlertDuration < 0)