diff options
Diffstat (limited to 'telephony/java')
3 files changed, 3 insertions, 13 deletions
diff --git a/telephony/java/com/android/internal/telephony/DataConnectionTracker.java b/telephony/java/com/android/internal/telephony/DataConnectionTracker.java index 79c4b41..ece708a 100644 --- a/telephony/java/com/android/internal/telephony/DataConnectionTracker.java +++ b/telephony/java/com/android/internal/telephony/DataConnectionTracker.java @@ -280,16 +280,8 @@ public abstract class DataConnectionTracker extends Handler { if (!dataEnabled[apnId]) { dataEnabled[apnId] = true; enabledCount++; - if (enabledCount == 1) { - if (onTrySetupData(null) == false) { - // failed to setup data - note we can't optimize by only adj - // these after a successfull call. dataEnabled must be set - // prior or we think data is not available. - dataEnabled[apnId] = false; - enabledCount--; - } - } } + onTrySetupData(null); } else { // disable if (dataEnabled[apnId]) { diff --git a/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java b/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java index 3cabd2d..ffaa1cd 100644 --- a/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java +++ b/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java @@ -568,8 +568,7 @@ public final class CdmaDataConnectionTracker extends DataConnectionTracker { private boolean retryAfterDisconnected(String reason) { boolean retry = true; - if ( Phone.REASON_RADIO_TURNED_OFF.equals(reason) || - Phone.REASON_DATA_DISABLED.equals(reason) ) { + if ( Phone.REASON_RADIO_TURNED_OFF.equals(reason) ) { retry = false; } return retry; diff --git a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java index d057dfe..0215ab2 100644 --- a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java +++ b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java @@ -1010,8 +1010,7 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker { private boolean retryAfterDisconnected(String reason) { boolean retry = true; - if ( Phone.REASON_RADIO_TURNED_OFF.equals(reason) || - Phone.REASON_DATA_DISABLED.equals(reason) ) { + if ( Phone.REASON_RADIO_TURNED_OFF.equals(reason) ) { retry = false; } return retry; |