summaryrefslogtreecommitdiffstats
path: root/telephony
diff options
context:
space:
mode:
authorSatish Roddom <satishroddom@motorola.com>2009-09-16 05:52:58 -0500
committerWink Saville <wink@google.com>2009-09-17 11:59:47 -0700
commitea803b8e0cc613309d0ce096df9c13e9690243ff (patch)
tree52d76ea829cdf1a8f87bc7adc318133438908030 /telephony
parent8460be7a57117d786adf2e1233ef02c4e96f0030 (diff)
downloadframeworks_base-ea803b8e0cc613309d0ce096df9c13e9690243ff.zip
frameworks_base-ea803b8e0cc613309d0ce096df9c13e9690243ff.tar.gz
frameworks_base-ea803b8e0cc613309d0ce096df9c13e9690243ff.tar.bz2
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
Diffstat (limited to 'telephony')
-rw-r--r--telephony/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/telephony/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java b/telephony/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java
index 730dc49..7baf770 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.