Remove airplane mode and mobile data check for MMS request executionandroid-5.1.1_r5android-5.1.1_r28android-5.1.1_r22android-5.1.1_r17android-5.1.1_r12lollipop-mr1-wfc-release

The check prevents MMS from being sent if wifi or other channel can be
used to send MMS. When there is an API in telephony allowing the check
of available MMS channels, the check should be added back

Bug: 19519883, 19525242
Change-Id: Ie90a4f3eabf3155159dd307bd613f669cda88ac6

1 files changed, 2 insertions, 18 deletions

diff --git a/src/com/android/mms/service/MmsRequest.java b/src/com/android/mms/service/MmsRequest.java
index 00aea57..27cb968 100644
--- a/src/com/android/mms/service/MmsRequest.java
+++ b/src/com/android/mms/service/MmsRequest.java
@@ -107,21 +107,6 @@ public abstract class MmsRequest {
         return mMmsConfig != null;
     }
 
-    private static boolean inAirplaneMode(final Context context) {
-        return Settings.System.getInt(context.getContentResolver(),
-                Settings.Global.AIRPLANE_MODE_ON, 0) != 0;
-    }
-
-    private static boolean isMobileDataEnabled(final Context context, final int subId) {
-        final TelephonyManager telephonyManager =
-                (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
-        return telephonyManager.getDataEnabled(subId);
-    }
-
-    private static boolean isDataNetworkAvailable(final Context context, final int subId) {
-        return !inAirplaneMode(context) && isMobileDataEnabled(context, subId);
-    }
-
     /**
      * Execute the request
      *
@@ -132,15 +117,14 @@ public abstract class MmsRequest {
         int result = SmsManager.MMS_ERROR_UNSPECIFIED;
         int httpStatusCode = 0;
         byte[] response = null;
+        // TODO: add mms data channel check back to fast fail if no way to send mms,
+        // when telephony provides such API.
         if (!ensureMmsConfigLoaded()) { // Check mms config
             Log.e(MmsService.TAG, "MmsRequest: mms config is not loaded yet");
             result = SmsManager.MMS_ERROR_CONFIGURATION_ERROR;
         } else if (!prepareForHttpRequest()) { // Prepare request, like reading pdu data from user
             Log.e(MmsService.TAG, "MmsRequest: failed to prepare for request");
             result = SmsManager.MMS_ERROR_IO_ERROR;
-        } else if (!isDataNetworkAvailable(context, mSubId)) {
-            Log.e(MmsService.TAG, "MmsRequest: in airplane mode or mobile data disabled");
-            result = SmsManager.MMS_ERROR_NO_DATA_NETWORK;
         } else { // Execute
             long retryDelaySecs = 2;
             // Try multiple times of MMS HTTP request