From 117eace23924f575877ae8ecbb899af22e6f16c0 Mon Sep 17 00:00:00 2001 From: Cheng Yang Date: Sat, 11 Jul 2009 00:04:57 +0800 Subject: [PATCH] Block incoming SMS in CDMA Emergency Callback Mode Block incoming SMS in CDMA Emergency Callback Mode CDMA carriers expect that incoming SMS is not processed by phone while it is in Emergency Callback Mode, so don't acknowlegde it to the network. --- .../internal/telephony/cdma/CdmaSMSDispatcher.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/telephony/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java b/telephony/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java index ecdc8f643b0df..c4db6098fd07c 100644 --- a/telephony/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java +++ b/telephony/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java @@ -25,12 +25,14 @@ import android.database.Cursor; import android.database.SQLException; import android.os.AsyncResult; import android.os.Message; +import android.os.SystemProperties; import android.provider.Telephony; import android.provider.Telephony.Sms.Intents; import android.preference.PreferenceManager; import android.util.Config; import android.util.Log; +import com.android.internal.telephony.TelephonyProperties; import com.android.internal.telephony.CommandsInterface; import com.android.internal.telephony.SmsHeader; import com.android.internal.telephony.SmsMessageBase; @@ -75,6 +77,11 @@ final class CdmaSMSDispatcher extends SMSDispatcher { return Intents.RESULT_SMS_GENERIC_ERROR; } + String inEcm=SystemProperties.get(TelephonyProperties.PROPERTY_INECM_MODE, "false"); + if (inEcm.equals("true")) { + return Intents.RESULT_SMS_GENERIC_ERROR; + } + // Decode BD stream and set sms variables. SmsMessage sms = (SmsMessage) smsb; sms.parseSms(); @@ -343,6 +350,12 @@ final class CdmaSMSDispatcher extends SMSDispatcher { /** {@inheritDoc} */ protected void acknowledgeLastIncomingSms(boolean success, int result, Message response){ // FIXME unit test leaves cm == null. this should change + + String inEcm=SystemProperties.get(TelephonyProperties.PROPERTY_INECM_MODE, "false"); + if (inEcm.equals("true")) { + return; + } + if (mCm != null) { mCm.acknowledgeLastIncomingCdmaSms(success, resultToCause(result), response); }