diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-03-08 00:09:42 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-03-08 00:09:42 +0000 |
| commit | 05606c33b0350e5de22fc489fd2491b9985c2f6f (patch) | |
| tree | 1999464ab95a466407d1b9f936a0f05c78ba65b3 | |
| parent | f1552cba9c742a3ed11ee44f730af78a53157997 (diff) | |
| parent | c4e7053458df8380adb4f800cda40e195e027f14 (diff) | |
| download | platform_packages_apps_CellBroadcastReceiver-android10-qpr3-s1-release.tar.gz platform_packages_apps_CellBroadcastReceiver-android10-qpr3-s1-release.tar.bz2 platform_packages_apps_CellBroadcastReceiver-android10-qpr3-s1-release.zip | |
Snap for 6274245 from c4e7053458df8380adb4f800cda40e195e027f14 to qt-qpr3-releaseandroid-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android10-qpr3-s1-releaseandroid10-qpr3-release
Change-Id: I3d185a38981867048d9809953cd73b76cbaae9b5
| -rw-r--r-- | res/raw/info.ogg | bin | 0 -> 7593 bytes | |||
| -rw-r--r-- | src/com/android/cellbroadcastreceiver/CellBroadcastAlertAudio.java | 7 |
2 files changed, 1 insertions, 6 deletions
diff --git a/res/raw/info.ogg b/res/raw/info.ogg Binary files differnew file mode 100644 index 000000000..fe3013759 --- /dev/null +++ b/res/raw/info.ogg diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertAudio.java b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertAudio.java index 8d913dfe1..e7b2cfa63 100644 --- a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertAudio.java +++ b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertAudio.java @@ -36,7 +36,6 @@ import android.os.Message; import android.os.VibrationEffect; import android.os.Vibrator; import android.preference.PreferenceManager; -import android.provider.Settings; import android.speech.tts.TextToSpeech; import android.telephony.PhoneStateListener; import android.telephony.TelephonyManager; @@ -428,11 +427,7 @@ public class CellBroadcastAlertAudio extends Service implements TextToSpeech.OnI setDataSourceFromResource(res, mMediaPlayer, R.raw.etws_default); break; case INFO: - // for non-emergency alerts, we are using system default notification sound. - String sound = Settings.System.getString( - getApplicationContext().getContentResolver(), - Settings.System.NOTIFICATION_SOUND); - mMediaPlayer.setDataSource(sound); + setDataSourceFromResource(res, mMediaPlayer, R.raw.info); break; case TEST: case DEFAULT: |