diff options
| author | Jake Hamby <jhamby@google.com> | 2012-06-27 15:30:17 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-27 15:30:17 -0700 |
| commit | 4a02a5ccfc3363f61a1ce6fdb76008f1cdd5c41a (patch) | |
| tree | a193321d4652cb20302c287b9168caa6a87b7c3d /telephony/java | |
| parent | 809705c33144e66e51ef4a2f17ad8b02eed5cd80 (diff) | |
| parent | ca2c7b7d96625cf515af88ad30062405b38cb094 (diff) | |
| download | frameworks_base-4a02a5ccfc3363f61a1ce6fdb76008f1cdd5c41a.zip frameworks_base-4a02a5ccfc3363f61a1ce6fdb76008f1cdd5c41a.tar.gz frameworks_base-4a02a5ccfc3363f61a1ce6fdb76008f1cdd5c41a.tar.bz2 | |
am ca2c7b7d: Merge "Fix detection of CDMA CMAS cell broadcasts." into jb-dev
* commit 'ca2c7b7d96625cf515af88ad30062405b38cb094':
Fix detection of CDMA CMAS cell broadcasts.
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 ^ |