Revert "Use a config to enable MMS when mobile data is off"lineage-15.0

Use carrier_metered types instead, like this:
https://review.lineageos.org/#/c/197464/

This reverts commit 33acc52d6740cbd21e656f6d7f6ba5f8c47b903a.

Change-Id: I6bdd7c0de96113afe94903864cb28ff31813f939

1 files changed, 1 insertions, 20 deletions

diff --git a/src/java/com/android/internal/telephony/dataconnection/DcTracker.java b/src/java/com/android/internal/telephony/dataconnection/DcTracker.java
index 92886c01f..46572f846 100644
--- a/src/java/com/android/internal/telephony/dataconnection/DcTracker.java
+++ b/src/java/com/android/internal/telephony/dataconnection/DcTracker.java
@@ -1616,15 +1616,6 @@ public class DcTracker extends Handler {
             }
         }
 
-        if (apnContext.getApnType().equals(PhoneConstants.APN_TYPE_MMS)) {
-            CarrierConfigManager configManager = (CarrierConfigManager) mPhone.getContext()
-                    .getSystemService(Context.CARRIER_CONFIG_SERVICE);
-            PersistableBundle pb = configManager.getConfigForSubId(mPhone.getSubId());
-            if (pb != null) {
-                isDataAllowed = pb.getBoolean("config_enable_mms_with_mobile_data_off");
-            }
-        }
-
         if (apnContext.isConnectable()
                 && (isEmergencyApn
                 || (isDataAllowed && isDataAllowedForApn(apnContext) && !isEmergency()))) {
@@ -2588,13 +2579,6 @@ public class DcTracker extends Handler {
                 }
             } else if (met) {
                 apnContext.setReason(Phone.REASON_DATA_DISABLED);
-                CarrierConfigManager configManager = (CarrierConfigManager) mPhone.getContext()
-                        .getSystemService(Context.CARRIER_CONFIG_SERVICE);
-                PersistableBundle pb = configManager.getConfigForSubId(mPhone.getSubId());
-                boolean mmsWithMobileDataOff = false;
-                if (pb != null) {
-                    mmsWithMobileDataOff = pb.getBoolean("config_enable_mms_with_mobile_data_off");
-                }
                 // If ConnectivityService has disabled this network, stop trying to bring
                 // it up, but do not tear it down - ConnectivityService will do that
                 // directly by talking with the DataConnection.
@@ -2604,10 +2588,7 @@ public class DcTracker extends Handler {
                 // request goes away.  This applies to both CDMA and GSM because they both
                 // can declare the DUN APN sharable by default traffic, thus still satisfying
                 // those requests and not torn down organically.
-                if ((apnContext.getApnType() == PhoneConstants.APN_TYPE_DUN && teardownForDun())
-                        || apnContext.getState() != DctConstants.State.CONNECTED
-                        || (mmsWithMobileDataOff
-                                    && apnContext.getApnType().equals(PhoneConstants.APN_TYPE_MMS))) {
+                if (apnContext.getApnType() == PhoneConstants.APN_TYPE_DUN && teardownForDun()) {
                     cleanup = true;
                 } else {
                     cleanup = false;