diff options
author | Jake Hamby <jhamby@google.com> | 2013-05-08 13:33:53 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-08 13:33:53 -0700 |
commit | faaf63301da2ec840a9fa750196edeb1f74c23c5 (patch) | |
tree | cfbcd245380436387278aa6a0644e69e78a71601 | |
parent | 4198ae36d4cc0b5726125b3a122e645dcd7befdb (diff) | |
parent | 2e572064f74d19a91436c6ff7723c9a18230f954 (diff) | |
download | android_packages_apps_CellBroadcastReceiver-faaf63301da2ec840a9fa750196edeb1f74c23c5.tar.gz android_packages_apps_CellBroadcastReceiver-faaf63301da2ec840a9fa750196edeb1f74c23c5.tar.bz2 android_packages_apps_CellBroadcastReceiver-faaf63301da2ec840a9fa750196edeb1f74c23c5.zip |
am 2e572064: Merge "4373 & 4374 part of Severe Alerts"
* commit '2e572064f74d19a91436c6ff7723c9a18230f954':
4373 & 4374 part of Severe Alerts
-rw-r--r-- | src/com/android/cellbroadcastreceiver/CellBroadcastConfigService.java | 4 | ||||
-rw-r--r-- | src/com/android/cellbroadcastreceiver/CellBroadcastDatabaseHelper.java | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastConfigService.java b/src/com/android/cellbroadcastreceiver/CellBroadcastConfigService.java index 7ebb75a0..17b9bee1 100644 --- a/src/com/android/cellbroadcastreceiver/CellBroadcastConfigService.java +++ b/src/com/android/cellbroadcastreceiver/CellBroadcastConfigService.java @@ -180,9 +180,9 @@ public class CellBroadcastConfigService extends IntentService { // set up broadcast ID ranges to be used for each category int cmasExtremeStart = SmsCbConstants.MESSAGE_ID_CMAS_ALERT_EXTREME_IMMEDIATE_OBSERVED; - int cmasExtremeEnd = SmsCbConstants.MESSAGE_ID_CMAS_ALERT_EXTREME_EXPECTED_LIKELY; + int cmasExtremeEnd = SmsCbConstants.MESSAGE_ID_CMAS_ALERT_EXTREME_IMMEDIATE_LIKELY; int cmasSevereStart = - SmsCbConstants.MESSAGE_ID_CMAS_ALERT_SEVERE_IMMEDIATE_OBSERVED; + SmsCbConstants.MESSAGE_ID_CMAS_ALERT_EXTREME_EXPECTED_OBSERVED; int cmasSevereEnd = SmsCbConstants.MESSAGE_ID_CMAS_ALERT_SEVERE_EXPECTED_LIKELY; int cmasAmber = SmsCbConstants.MESSAGE_ID_CMAS_ALERT_CHILD_ABDUCTION_EMERGENCY; int cmasTestStart = SmsCbConstants.MESSAGE_ID_CMAS_ALERT_REQUIRED_MONTHLY_TEST; diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastDatabaseHelper.java b/src/com/android/cellbroadcastreceiver/CellBroadcastDatabaseHelper.java index 588b29c3..a837ae76 100644 --- a/src/com/android/cellbroadcastreceiver/CellBroadcastDatabaseHelper.java +++ b/src/com/android/cellbroadcastreceiver/CellBroadcastDatabaseHelper.java @@ -234,14 +234,14 @@ public class CellBroadcastDatabaseHelper extends SQLiteOpenHelper { break; case SmsCbConstants.MESSAGE_ID_CMAS_ALERT_EXTREME_EXPECTED_OBSERVED: - cmasMessageClass = SmsCbCmasInfo.CMAS_CLASS_EXTREME_THREAT; + cmasMessageClass = SmsCbCmasInfo.CMAS_CLASS_SEVERE_THREAT; cmasSeverity = SmsCbCmasInfo.CMAS_SEVERITY_EXTREME; cmasUrgency = SmsCbCmasInfo.CMAS_URGENCY_EXPECTED; cmasCertainty = SmsCbCmasInfo.CMAS_CERTAINTY_OBSERVED; break; case SmsCbConstants.MESSAGE_ID_CMAS_ALERT_EXTREME_EXPECTED_LIKELY: - cmasMessageClass = SmsCbCmasInfo.CMAS_CLASS_EXTREME_THREAT; + cmasMessageClass = SmsCbCmasInfo.CMAS_CLASS_SEVERE_THREAT; cmasSeverity = SmsCbCmasInfo.CMAS_SEVERITY_EXTREME; cmasUrgency = SmsCbCmasInfo.CMAS_URGENCY_EXPECTED; cmasCertainty = SmsCbCmasInfo.CMAS_CERTAINTY_LIKELY; |