diff options
| author | Jake Hamby <jhamby@google.com> | 2012-06-25 15:27:46 -0700 |
|---|---|---|
| committer | Jake Hamby <jhamby@google.com> | 2012-06-25 16:30:06 -0700 |
| commit | 0f40a51b2027c4dbca88f682c7c8691da0ffcf99 (patch) | |
| tree | 182d2e0ff79997d00041a2086ad93bb79463684a /telephony/java | |
| parent | fcd7cf2a24eaff85085fde58dc8c69f8ff374575 (diff) | |
| download | frameworks_base-0f40a51b2027c4dbca88f682c7c8691da0ffcf99.zip frameworks_base-0f40a51b2027c4dbca88f682c7c8691da0ffcf99.tar.gz frameworks_base-0f40a51b2027c4dbca88f682c7c8691da0ffcf99.tar.bz2 | |
Fix detection of CDMA CMAS cell broadcasts.
CMAS cell broadcasts do not necessarily set the message
priority indicator subparameter. Interpret the user data as a
CMAS message if the service category is in the CMAS range.
Includes a new test case in CdmaSmsCbTest to verify correct
decoding of an actual CMAS monthly test message.
Bug: 6506785
Change-Id: I2a26a5194a1a02e34c1ef862ff348e1571df51c4
Diffstat (limited to 'telephony/java')
| -rwxr-xr-x | telephony/java/com/android/internal/telephony/cdma/sms/BearerData.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/telephony/java/com/android/internal/telephony/cdma/sms/BearerData.java b/telephony/java/com/android/internal/telephony/cdma/sms/BearerData.java index e70ff18..0f49762 100755 --- a/telephony/java/com/android/internal/telephony/cdma/sms/BearerData.java +++ b/telephony/java/com/android/internal/telephony/cdma/sms/BearerData.java @@ -1916,8 +1916,7 @@ public final class BearerData { throw new CodingException("missing MESSAGE_IDENTIFIER subparam"); } if (bData.userData != null) { - if (isCmasAlertCategory(serviceCategory) && bData.priorityIndicatorSet - && bData.priority == SmsCbMessage.MESSAGE_PRIORITY_EMERGENCY) { + if (isCmasAlertCategory(serviceCategory)) { decodeCmasUserData(bData, serviceCategory); } else if (bData.userData.msgEncoding == UserData.ENCODING_IS91_EXTENDED_PROTOCOL) { if ((foundSubparamMask ^ |