Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 6ce96faa: Don\'t mark an APN disabled if setup fails

Browse Source 
Merge commit '6ce96faa0c8dc74ea6d1391aa54d9c6909810dc1' into eclair-plus-aosp

* commit '6ce96faa0c8dc74ea6d1391aa54d9c6909810dc1':
  Don't mark an APN disabled if setup fails
This commit is contained in:
Robert Greenwalt
2009-08-28 14:39:49 -07:00
committed by Android Git Automerger
parent 7a6a3c4655 6ce96faa0c
commit 0737ae93b2
3 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
telephony/java/com/android/internal/telephony/DataConnectionTracker.java
View File

@@ -280,16 +280,8 @@ public abstract class DataConnectionTracker extends Handler {
if (!dataEnabled[apnId]) { if (!dataEnabled[apnId]) {
dataEnabled[apnId] = true; dataEnabled[apnId] = true;
enabledCount++; 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 { } else {
// disable // disable
if (dataEnabled[apnId]) { if (dataEnabled[apnId]) {

3
telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
View File

@@ -568,8 +568,7 @@ public final class CdmaDataConnectionTracker extends DataConnectionTracker {
private boolean retryAfterDisconnected(String reason) { private boolean retryAfterDisconnected(String reason) {
boolean retry = true; boolean retry = true;
if ( Phone.REASON_RADIO_TURNED_OFF.equals(reason) || if ( Phone.REASON_RADIO_TURNED_OFF.equals(reason) ) {
Phone.REASON_DATA_DISABLED.equals(reason) ) {
retry = false; retry = false;
} }
return retry; return retry;

3
telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
View File

@@ -1010,8 +1010,7 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
private boolean retryAfterDisconnected(String reason) { private boolean retryAfterDisconnected(String reason) {
boolean retry = true; boolean retry = true;
if ( Phone.REASON_RADIO_TURNED_OFF.equals(reason) || if ( Phone.REASON_RADIO_TURNED_OFF.equals(reason) ) {
Phone.REASON_DATA_DISABLED.equals(reason) ) {
retry = false; retry = false;
} }
return retry; return retry;