summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Yu <jackyu@google.com>2015-09-16 01:53:25 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-16 01:53:25 +0000
commit55fd5684dbfa298eef3986a362b025c8d0ee9af7 (patch)
treec862274809649e0c2032dfb8bc094c2c477d9721
parentf7a54c75214a368b3e9d64a9db1e4cd8ef96c29e (diff)
parent3f0f50fec447cf296a86ebcdfbe8f6e5dada6040 (diff)
downloadandroid_packages_apps_CellBroadcastReceiver-55fd5684dbfa298eef3986a362b025c8d0ee9af7.tar.gz
android_packages_apps_CellBroadcastReceiver-55fd5684dbfa298eef3986a362b025c8d0ee9af7.tar.bz2
android_packages_apps_CellBroadcastReceiver-55fd5684dbfa298eef3986a362b025c8d0ee9af7.zip
am 3f0f50fe: am a0b0023a: Fixed the incorrect audio duration used for ETWS messages.
* commit '3f0f50fec447cf296a86ebcdfbe8f6e5dada6040': Fixed the incorrect audio duration used for ETWS messages.
-rw-r--r--src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java
index c51dc392..535a1836 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java
@@ -335,7 +335,8 @@ public class CellBroadcastAlertService extends Service {
} else {
duration = SubscriptionManager.getIntegerSubscriptionProperty(message.getSubId(),
SubscriptionManager.CB_ALERT_SOUND_DURATION,
- Integer.parseInt(CellBroadcastSettings.ALERT_SOUND_DEFAULT_DURATION), this);
+ Integer.parseInt(CellBroadcastSettings.ALERT_SOUND_DEFAULT_DURATION), this)
+ * 1000;
}
audioIntent.putExtra(CellBroadcastAlertAudio.ALERT_AUDIO_DURATION_EXTRA, duration);