am b9c107a3: Merge change 25534 into eclair

Merge commit 'b9c107a362d85deda61da3cfac594cc1de7b6294' into eclair-plus-aosp

* commit 'b9c107a362d85deda61da3cfac594cc1de7b6294':
  Message Reject notification shouldn't be shown in Emergency Calling Mode

telephony/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java

@@ -105,7 +105,7 @@ final class CdmaSMSDispatcher extends SMSDispatcher {
 
         String inEcm=SystemProperties.get(TelephonyProperties.PROPERTY_INECM_MODE, "false");
         if (inEcm.equals("true")) {
-            return Intents.RESULT_SMS_GENERIC_ERROR;
+            return Activity.RESULT_OK;
         }
 
         // See if we have a network duplicate SMS.