删除短信中彩信相关的功能

• alps/frameworks/opt/telephony/src/java/com/android/internal/telephony/InboundSmsHandler.java

--- a/alps/frameworks/opt/telephony/src/java/com/android/internal/telephony/InboundSmsHandler.java
+++ b/alps/frameworks/opt/telephony/src/java/com/android/internal/telephony/InboundSmsHandler.java
@@ -1002,7 +1002,7 @@ public abstract class InboundSmsHandler extends StateMachine {
             if (DBG) log("dispatchWapPdu() returned " + result);
             // result is Activity.RESULT_OK if an ordered broadcast was sent
             if (result == Activity.RESULT_OK) {
-                return true;
+                return false;
             } else {

• alps/frameworks/opt/telephony/src/java/com/android/internal/telephony/WapPushOverSms.java

--- a/alps/frameworks/opt/telephony/src/java/com/android/internal/telephony/WapPushOverSms.java
+++ b/alps/frameworks/opt/telephony/src/java/com/android/internal/telephony/WapPushOverSms.java
@@ -291,7 +291,7 @@ public class WapPushOverSms implements ServiceConnection {
             return result.statusCode;
         }
 
-        if (SmsManager.getDefault().getAutoPersisting()) {
+        if (SmsManager.getDefault().getAutoPersisting() && !result.mimeType.equals(WspTypeDecoder.CONTENT_TYPE_B_MMS)) {
             // Store the wap push data in telephony
             writeInboxMessage(result.subId, result.parsedPdu);
         }
@@ -353,6 +353,11 @@ public class WapPushOverSms implements ServiceConnection {
             return Intents.RESULT_SMS_GENERIC_ERROR;
         }
 

+        if (result.mimeType.equals(WspTypeDecoder.CONTENT_TYPE_B_MMS)) {
+                       return Activity.RESULT_OK;
+               }

         Intent intent = new Intent(Intents.WAP_PUSH_DELIVER_ACTION);
         intent.setType(result.mimeType);

• alps/vendor/mediatek/proprietary/packages/apps/Mms/src/com/android/mms/ui/ComposeMessageActivity.java

--- a/alps/vendor/mediatek/proprietary/packages/apps/Mms/src/com/android/mms/ui/ComposeMessageActivity.java
+++ b/alps/vendor/mediatek/proprietary/packages/apps/Mms/src/com/android/mms/ui/ComposeMessageActivity.java
@@ -4764,7 +4764,8 @@ public class ComposeMessageActivity extends Activity
             }
         }
         /// @}
-        if (mIsSmsEnabled) {
+        /*if (mIsSmsEnabled) {
             if (!isSubjectEditorVisible()) {
                 menu.add(0, MENU_ADD_SUBJECT, 0,
                         R.string.add_subject).setIcon(R.drawable.ic_menu_edit);
@@ -4774,7 +4775,8 @@ public class ComposeMessageActivity extends Activity
                     .setIcon(R.drawable.ic_menu_attachment)
                 .setTitle(R.string.add_attachment)
                     .setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);    // add to actionbar
-        }
+        }*/
         buildAddAddressToContactMenuItem(menu);

• alps/vendor/mediatek/proprietary/packages/apps/Mms/src/com/mediatek/setting/SettingListActivity.java

--- a/alps/vendor/mediatek/proprietary/packages/apps/Mms/src/com/mediatek/setting/SettingListActivity.java
+++ b/alps/vendor/mediatek/proprietary/packages/apps/Mms/src/com/mediatek/setting/SettingListActivity.java
@@ -139,7 +139,7 @@ public class SettingListActivity extends ListActivity {
     private void setAdapter() {
         String[] settingList = new String[] {
                 getResources().getString(R.string.pref_setting_sms),
-                getResources().getString(R.string.pref_setting_mms),
+                //getResources().getString(R.string.pref_setting_mms),
                 getResources().getString(R.string.pref_setting_notification),
                 getResources().getString(R.string.pref_setting_general)
         };
@@ -200,21 +200,23 @@ public class SettingListActivity extends ListActivity {
                             SmsPreferenceActivity.class);
                     startActivity(smsPreferenceIntent);
                     break;
-                case 2:
+               /* case 2:
                     Intent mmsPreferenceIntent = new Intent(SettingListActivity.this,
                             MmsPreferenceActivity.class);
                     startActivity(mmsPreferenceIntent);
-                    break;
-                case 3:
+                    break;*/
+                case 2:
                     Intent notificationPreferenceIntent = new Intent(SettingListActivity.this,
                             NotificationPreferenceActivity.class);
                     startActivity(notificationPreferenceIntent);
                     break;
-                case 4:
+                case 3:
                     Intent generalPreferenceIntent = new Intent(SettingListActivity.this,
                             GeneralPreferenceActivity.class);
                     startActivity(generalPreferenceIntent);
                     break;
                 case 5:
                     mOpSettingListActivityExt.onListItemClick(position);
                     break;