From ea803b8e0cc613309d0ce096df9c13e9690243ff Mon Sep 17 00:00:00 2001 From: Satish Roddom Date: Wed, 16 Sep 2009 05:52:58 -0500 Subject: [PATCH] Message Reject notification shouldn't be shown in Emergency Calling Mode Issue: While in emergency mode, if we receive a message, there is a notification being shown as "Text Message rejected". Fix: In CdmaSMSDispatcher.java, send RESULT_OK response instead of RESULT_SMS_GENERIC_ERROR for messages during Emergency mode. So, that SMS_REJECTED action is not broadcasted. If the result is RESULT_OK from CdmaSMSDispatcher, the function notifyAndAcknowledgeLastIncomingSms() is not called from SMSDispatcher.java and hence SMS_REJECTED_ACTION intent is not broadcast. Consequently SMSRejectReceiver.java will not receive the broadcast and will not show reject notification. Change-Id: I2aa8f239393b3e6eeac6b0c2bb69799018e9ae9d --- .../com/android/internal/telephony/cdma/CdmaSMSDispatcher.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/telephony/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java b/telephony/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java index 730dc49a4f029..7baf7705ede94 100644 --- a/telephony/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java +++ b/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.