From 0f40a51b2027c4dbca88f682c7c8691da0ffcf99 Mon Sep 17 00:00:00 2001 From: Jake Hamby Date: Mon, 25 Jun 2012 15:27:46 -0700 Subject: 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 --- telephony/java/com/android/internal/telephony/cdma/sms/BearerData.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'telephony/java') 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 ^ -- cgit v1.1