commit 65f3adbe5770791b7182057dbac6ea2fb04285fe
author Treehugger Robot <treehugger-gerrit@google.com> Wed May 11 23:38:07 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed May 11 23:38:07 2016 +0000
tree bd5eccea61fbdf21c2abf3bc98004bd4731e4e9c
parent a3a090a40fa97301da43e9d6f5d7bf57f714e802
parent 59e88195582b51a719790d7fc8a570d4702e3f62

Merge "Correct message length calculation while sending SMS"

src/com/android/bluetooth/map/BluetoothMapbMessage.java

diff --git a/src/com/android/bluetooth/map/BluetoothMapbMessage.java b/src/com/android/bluetooth/map/BluetoothMapbMessage.java
index 9a77568..97e8c45 100644
--- a/src/com/android/bluetooth/map/BluetoothMapbMessage.java
+++ b/src/com/android/bluetooth/map/BluetoothMapbMessage.java
@@ -746,8 +746,7 @@
                  * END:MSG in the actual message content, it is now safe to use the END:MSG tag
                  * as terminator, and simply ignore the length field.*/
 
-                /* 2 added to compensate for the removed \r\n */
-                byte[] rawData = reader.getDataBytes(mBMsgLength - (line.getBytes().length + 2));
+                byte[] rawData = reader.getDataBytes(mBMsgLength);
                 String data;
                 try {
                     data = new String(rawData, "UTF-8");