From 6162b232a23f1277b86039629b7c4d5796a86343 Mon Sep 17 00:00:00 2001 From: Ricardo Cerqueira Date: Thu, 4 Aug 2016 17:20:27 +0100 Subject: DCT: Tear down MMS+default connections raised by config_enable_mms_with_mobile_data_off If the tracker lets an MMS connection go through even if data is off, make sure it's torn down once the disabled state gets applied. More often than not, APNs configured as MMS+data would remain alive, and the tracker's state machine would get stuck out of sync Ref: CYNGNOS-3239 Change-Id: Ia13e9ff5beea44ecfda40a4910990dab53af25dd --- src/java/com/android/internal/telephony/dataconnection/DcTracker.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/java/com/android/internal/telephony/dataconnection/DcTracker.java b/src/java/com/android/internal/telephony/dataconnection/DcTracker.java index e1569ae8f..bd59e520f 100644 --- a/src/java/com/android/internal/telephony/dataconnection/DcTracker.java +++ b/src/java/com/android/internal/telephony/dataconnection/DcTracker.java @@ -1702,6 +1702,9 @@ public class DcTracker extends DcTrackerBase { // those requests and not torn down organically. if ((apnContext.getApnType() == PhoneConstants.APN_TYPE_DUN && teardownForDun()) || apnContext.getState() != DctConstants.State.CONNECTED + || (ConfigResourceUtil.getBooleanValue(mPhone.getContext(), + "config_enable_mms_with_mobile_data_off") && + apnContext.getApnType().equals(PhoneConstants.APN_TYPE_MMS)) || mPhone.getSubId() != SubscriptionManager.getDefaultDataSubId() ) { cleanup = true; } else { -- cgit v1.2.3