commit 7b88af679a9a3b5737343bb996ef392b76d19e73
author Wei Huang <weih@google.com> Thu Apr 22 16:33:40 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 22 16:33:40 2010 -0700
tree c7ee72a03f9c8d344ece09a47768112b43186f4b
parent 90c6aec10f969acf9b171b82920480fb6aeb007f
parent fdf3b26ba78ed308f45a2c6f79a5f977663ac3c8

Merge "bug #2618035: applying Moto's patch to fix a email/shortcode parsing bug." into froyo

telephony/java/com/android/internal/telephony/SmsMessageBase.java

diff --git a/telephony/java/com/android/internal/telephony/SmsMessageBase.java b/telephony/java/com/android/internal/telephony/SmsMessageBase.java
index 3c2f2ed..af6c5f8 100644
--- a/telephony/java/com/android/internal/telephony/SmsMessageBase.java
+++ b/telephony/java/com/android/internal/telephony/SmsMessageBase.java
@@ -21,6 +21,7 @@
 import java.util.Arrays;
 
 import static android.telephony.SmsMessage.MessageClass;
+import android.provider.Telephony;
 
 /**
  * Base class declaring the specific methods and members for SmsMessage.
@@ -386,7 +387,7 @@
          if (parts.length < 2) return;
          emailFrom = parts[0];
          emailBody = parts[1];
-         isEmail = true;
+         isEmail = Telephony.Mms.isEmailAddress(emailFrom);
     }
 
 }