commit ef371799efdb82aaa8c1c45a24a65df723b1a659
author Tyler Gunn <tgunn@google.com> Fri Feb 02 22:52:24 2018 +0000
committer android-build-merger <android-build-merger@google.com> Fri Feb 02 22:52:24 2018 +0000
tree 6e7293ce404d0bac1f4614cdc83b97c6e1945b16
parent 2df72eb30fb5b52b63aa3095aa509ad114d3d8fe
parent cc02120a73a1433c9780aeb508b76e7a755e90df

Merge "Ensure emergency call tone plays regardless of ringer volume." am: 97532b297e am: e649400a3e
am: cc02120a73

Change-Id: I575b6b318ae66d94f6984b1396486998b0085d56

src/com/android/services/telephony/EmergencyTonePlayer.java

diff --git a/src/com/android/services/telephony/EmergencyTonePlayer.java b/src/com/android/services/telephony/EmergencyTonePlayer.java
index aaec24f..a21489d 100644
--- a/src/com/android/services/telephony/EmergencyTonePlayer.java
+++ b/src/com/android/services/telephony/EmergencyTonePlayer.java
@@ -67,11 +67,7 @@
                 startVibrate();
                 break;
             case EMERGENCY_TONE_ALERT:
-                // Only start if we are not in silent mode.
-                int ringerMode = mAudioManager.getRingerMode();
-                if (ringerMode == AudioManager.RINGER_MODE_NORMAL) {
-                    startAlert();
-                }
+                startAlert();
                 break;
             case EMERGENCY_TONE_OFF:
                 // nothing;