2 files changed, 10 insertions, 17 deletions
diff --git a/java/com/android/incallui/rtt/impl/RttChatFragment.java b/java/com/android/incallui/rtt/impl/RttChatFragment.java
index a33029501..2c8de09f4 100644
--- a/java/com/android/incallui/rtt/impl/RttChatFragment.java
+++ b/java/com/android/incallui/rtt/impl/RttChatFragment.java
@@ -56,6 +56,7 @@ import com.android.incallui.incall.protocol.PrimaryCallState;
 import com.android.incallui.incall.protocol.PrimaryInfo;
 import com.android.incallui.incall.protocol.SecondaryInfo;
 import com.android.incallui.rtt.impl.RttChatAdapter.MessageListener;
+import com.android.incallui.rtt.protocol.Constants;
 import com.android.incallui.rtt.protocol.RttCallScreen;
 import com.android.incallui.rtt.protocol.RttCallScreenDelegate;
 import com.android.incallui.rtt.protocol.RttCallScreenDelegateFactory;
@@ -162,6 +163,7 @@ public class RttChatFragment extends Fragment
           isClearingInput = true;
           editText.setText("");
           isClearingInput = false;
+          rttCallScreenDelegate.onLocalMessage(Constants.BUBBLE_BREAKER);
         });
     submitButton.setEnabled(false);
     endCallButton = view.findViewById(R.id.rtt_end_call_button);
diff --git a/java/com/android/incallui/rtt/impl/RttChatMessage.java b/java/com/android/incallui/rtt/impl/RttChatMessage.java
index b36da77cc..b2974ef97 100644
--- a/java/com/android/incallui/rtt/impl/RttChatMessage.java
+++ b/java/com/android/incallui/rtt/impl/RttChatMessage.java
@@ -74,23 +74,14 @@ final class RttChatMessage {
    */
   static String getChangedString(CharSequence s, int start, int before, int count) {
     StringBuilder modify = new StringBuilder();
-    if (before > count) {
-      int deleteStart = start + count;
-      int deleted = before - count;
-      int numberUnModifiedCharsAfterDeleted = s.length() - start - count;
-      char c = '\b';
-      for (int i = 0; i < deleted + numberUnModifiedCharsAfterDeleted; i++) {
-        modify.append(c);
-      }
-      modify.append(s, deleteStart, s.length());
-    } else {
-      int insertStart = start + before;
-      int numberUnModifiedCharsAfterInserted = s.length() - start - count;
-      char c = '\b';
-      for (int i = 0; i < numberUnModifiedCharsAfterInserted; i++) {
-        modify.append(c);
-      }
-      modify.append(s, insertStart, s.length());
+    char c = '\b';
+    int oldLength = s.length() - count + before;
+    for (int i = 0; i < oldLength - start; i++) {
+      modify.append(c);
+    }
+    modify.append(s, start, start + count);
+    if (start + count < s.length()) {
+      modify.append(s, start + count, s.length());
     }
     return modify.toString();
   }