DO NOT MERGE ANYWHERE: Bandaid audio focus

For some reason we aren't being granted audio focus.
Since we are an EMERGENCY ALERT broadcast I figure
it would make sense to just stream an alarm.

This isn't optimal, but we can focus on a better solution
for G.

Bug: 37192772
Test: Manual,Visual,Audible
Change-Id: If0cd8b90d9fb96a79ea8961940540485c6816c6a

1 files changed, 2 insertions, 7 deletions

diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertAudio.java b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertAudio.java
index fa6ec07f8..13a2c55e7 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertAudio.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertAudio.java
@@ -432,16 +432,10 @@ public class CellBroadcastAlertAudio extends Service implements TextToSpeech.OnI
                         setDataSourceFromResource(getResources(), mMediaPlayer,
                                 R.raw.cmas_default);
                 }
-
-                // start playing alert audio (unless master volume is vibrate only or silent).
-                mAudioManager.requestAudioFocus(null, AudioManager.STREAM_NOTIFICATION,
-                        AudioManager.AUDIOFOCUS_GAIN_TRANSIENT);
-
-                mMediaPlayer.setAudioStreamType(AudioManager.STREAM_NOTIFICATION);
+                mMediaPlayer.setAudioStreamType(AudioManager.STREAM_ALARM);
                 mMediaPlayer.setLooping(false);
                 mMediaPlayer.prepare();
                 mMediaPlayer.start();
-
             } catch (Exception ex) {
                 loge("Failed to play alert sound: " + ex);
             }
@@ -479,6 +473,7 @@ public class CellBroadcastAlertAudio extends Service implements TextToSpeech.OnI
             if (mMediaPlayer != null) {
                 try {
                     mMediaPlayer.stop();
+                    mMediaPlayer.reset();
                     mMediaPlayer.release();
                 } catch (IllegalStateException e) {
                     // catch "Unable to retrieve AudioTrack pointer for stop()" exception