Merge "Fix wrong reading the sms lengh of stored long sms in RUIM" am: c8ad4a82c7 am: 649f3bf73f

am: 56ed1f9c9d Change-Id: I039843725244d892248591cf4e88e1840e506733
2017-09-20 00:12:10 +00:00
parent dbb33c058b 56ed1f9c9d
commit 2869e57522
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.