diff options
| author | Chen Xu <fionaxu@google.com> | 2020-06-23 20:15:21 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-06-23 20:15:21 +0000 |
| commit | 2a0ac1a43f91a148e66866fe144d211992b8d025 (patch) | |
| tree | 3fb12f8f4ebe1f3ba2f6162dd1a94eac3f094343 /src/com/android | |
| parent | a2844c89534a103785330b37e33f19140283fa54 (diff) | |
| parent | 219e1dcb1710a0b722bf7b6a9f43d8378551d173 (diff) | |
| download | CellBroadcastReceiver-2a0ac1a43f91a148e66866fe144d211992b8d025.tar.gz | |
Merge "avoid null pointer failure when handling GSMA channels" into rvc-dev
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java | 2 | ||||
| -rw-r--r-- | src/com/android/cellbroadcastreceiver/CellBroadcastResources.java | 14 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java index ce810c0bf..53c32a601 100644 --- a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java +++ b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java @@ -312,7 +312,7 @@ public class CellBroadcastAlertService extends Service CellBroadcastChannelRange range = channelManager .getCellBroadcastChannelRangeFromMessage(message); if (CellBroadcastReceiver.isTestingMode(getApplicationContext()) - || range.mWriteToSmsInbox) { + || (range != null && range.mWriteToSmsInbox)) { writeMessageToSmsInbox(message); } } diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastResources.java b/src/com/android/cellbroadcastreceiver/CellBroadcastResources.java index 70e80c119..23f4dd19b 100644 --- a/src/com/android/cellbroadcastreceiver/CellBroadcastResources.java +++ b/src/com/android/cellbroadcastreceiver/CellBroadcastResources.java @@ -319,12 +319,14 @@ public class CellBroadcastResources { } if (channelManager.checkCellBroadcastChannelRange(serviceCategory, R.array.cmas_alert_extreme_channels_range_strings)) { - 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 (message.isCmasMessage()) { + 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; |