Merge "Fix wrong reading the sms lengh of stored long sms in RUIM"

am: c8ad4a82c7 Change-Id: Id1af6c8abd901f981ad1abfa5fbf4887ee694c17
2017-09-19 23:55:48 +00:00
parent c17b4e5a14 c8ad4a82c7
commit 649f3bf73f
1 changed files with 1 additions and 1 deletions
--- a/telephony/java/com/android/internal/telephony/cdma/SmsMessage.java
+++ b/telephony/java/com/android/internal/telephony/cdma/SmsMessage.java
@@ -161,7 +161,7 @@ public class SmsMessage extends SmsMessageBase {

            // Second byte is the MSG_LEN, length of the message
            // See 3GPP2 C.S0023 3.4.27
-            int size = data[1];
+            int size = data[1] & 0xFF;

            // Note: Data may include trailing FF's.  That's OK; message
            // should still parse correctly.