commit cc02120a73a1433c9780aeb508b76e7a755e90df
author Tyler Gunn <tgunn@google.com> Fri Feb 02 22:23:14 2018 +0000
committer android-build-merger <android-build-merger@google.com> Fri Feb 02 22:23:14 2018 +0000
tree 8b84a9a83800bfe018421269429b1bf6ece5c48f
parent 1bd119225caf3f0d0ff9d22ba7f5257e6f83fd41
parent e649400a3e595aae285487a3b27a76ac6542313e

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

Change-Id: I8ea44fcb838c70b7054d200aa1c9ef45bc8615e7

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;