am 56f72536: am 253230d4: Merge "Mms: Two popups are displayed when Press Enter key on message screen."

* commit '56f72536efb4f9d0c35f79b87df69c3b8315de17':
  Mms: Two popups are displayed when Press Enter key on message screen.

1 files changed, 1 insertions, 1 deletions

diff --git a/src/com/android/mms/ui/ComposeMessageActivity.java b/src/com/android/mms/ui/ComposeMessageActivity.java
index 2e44ce02..a4495576 100644
--- a/src/com/android/mms/ui/ComposeMessageActivity.java
+++ b/src/com/android/mms/ui/ComposeMessageActivity.java
@@ -3250,7 +3250,7 @@ public class ComposeMessageActivity extends Activity
         if (event != null) {
             // if shift key is down, then we want to insert the '\n' char in the TextView;
             // otherwise, the default action is to send the message.
-            if (!event.isShiftPressed()) {
+            if (!event.isShiftPressed() && event.getAction() == KeyEvent.ACTION_DOWN) {
                 if (isPreparedForSending()) {
                     confirmSendMessageIfNeeded();
                 }