Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am b9c107a3: Merge change 25534 into eclair

Browse Source 
Merge commit 'b9c107a362d85deda61da3cfac594cc1de7b6294' into eclair-plus-aosp

* commit 'b9c107a362d85deda61da3cfac594cc1de7b6294':
  Message Reject notification shouldn't be shown in Emergency Calling Mode
This commit is contained in:
Satish Roddom
2009-09-17 12:10:52 -07:00
committed by Android Git Automerger
parent 467765c55f b9c107a362
commit b075768b36
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
telephony/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java
View File

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