diff options
| author | fionaxu <fionaxu@google.com> | 2018-02-16 14:36:33 -0800 |
|---|---|---|
| committer | Jack Yu <jackyu@google.com> | 2018-02-22 11:41:13 -0800 |
| commit | a1d61b10bc4e40bad782887cd72daaea7c18ea42 (patch) | |
| tree | 41a771a05bcca32a657c7f6bf003d36c4e18ba51 /src/com/android/cellbroadcastreceiver/CellBroadcastResources.java | |
| parent | 6c45eefbdf962e5c55452a8bb177be5296409e9c (diff) | |
| download | CellBroadcastReceiver-a1d61b10bc4e40bad782887cd72daaea7c18ea42.tar.gz | |
support taiwan emergency alert requiement part 2
Bug: 70366785
Test: unit test
Test: manual
Merged-In: I6d305fe5a3b6b25da34b25f8db5904e81e2b69af
Change-Id: I6d305fe5a3b6b25da34b25f8db5904e81e2b69af
(cherry picked from commit b8887f8c01434f8499a5b7e51decaaacbc75648f)
Diffstat (limited to 'src/com/android/cellbroadcastreceiver/CellBroadcastResources.java')
| -rw-r--r-- | src/com/android/cellbroadcastreceiver/CellBroadcastResources.java | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastResources.java b/src/com/android/cellbroadcastreceiver/CellBroadcastResources.java index 626e2e2bd..50c264c26 100644 --- a/src/com/android/cellbroadcastreceiver/CellBroadcastResources.java +++ b/src/com/android/cellbroadcastreceiver/CellBroadcastResources.java @@ -280,14 +280,14 @@ public class CellBroadcastResources { if (CellBroadcastChannelManager.checkCellBroadcastChannelRange(subId, serviceCategory, R.array.cmas_alert_extreme_channels_range_strings, context)) { - if (cmasInfo.getSeverity() == SmsCbCmasInfo.CMAS_SEVERITY_EXTREME - && cmasInfo.getUrgency() == SmsCbCmasInfo.CMAS_URGENCY_IMMEDIATE) { - if (cmasInfo.getCertainty() == SmsCbCmasInfo.CMAS_CERTAINTY_OBSERVED) { - return R.string.cmas_extreme_immediate_observed_alert; - } else if (cmasInfo.getCertainty() == SmsCbCmasInfo.CMAS_CERTAINTY_LIKELY) { - return R.string.cmas_extreme_immediate_likely_alert; - } - } + if (cmasInfo.getSeverity() == SmsCbCmasInfo.CMAS_SEVERITY_EXTREME + && cmasInfo.getUrgency() == SmsCbCmasInfo.CMAS_URGENCY_IMMEDIATE) { + if (cmasInfo.getCertainty() == SmsCbCmasInfo.CMAS_CERTAINTY_OBSERVED) { + return R.string.cmas_extreme_immediate_observed_alert; + } else if (cmasInfo.getCertainty() == SmsCbCmasInfo.CMAS_CERTAINTY_LIKELY) { + return R.string.cmas_extreme_immediate_likely_alert; + } + } return R.string.cmas_extreme_alert; } if (CellBroadcastChannelManager.checkCellBroadcastChannelRange(subId, @@ -313,7 +313,7 @@ public class CellBroadcastResources { } if (CellBroadcastChannelManager.checkCellBroadcastChannelRange(subId, serviceCategory, R.array.safety_info_alerts_channels_range_strings, context)) { - return R.string.cb_other_message_identifiers; + return R.string.public_safety_message; } if (CellBroadcastAlertService.isEmergencyMessage(context, cbm)) { @@ -331,7 +331,7 @@ public class CellBroadcastResources { return R.string.etws_earthquake_warning; case ETWS_TSUNAMI: return R.string.etws_tsunami_warning; - case ETWS_TEST: + case TEST: return R.string.etws_test_message; case ETWS_DEFAULT: case OTHER: |