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

Merge change 27304 into eclair

Browse Source 
* changes:
  Fix Cdma re-start of default connection.
This commit is contained in:
Android (Google) Code Review
2009-09-27 18:10:28 -04:00
parent e02e8b9c11 e436d46e57
commit fdda2746d8
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -246,8 +246,7 @@ public final class CdmaDataConnectionTracker extends DataConnectionTracker {
@Override @Override
protected boolean isApnTypeActive(String type) { protected boolean isApnTypeActive(String type) {
return (isApnTypeAvailable(type) && return (isApnTypeAvailable(type) &&
mCdmaPhone.mSST.getCurrentCdmaDataConnectionState() == (state == State.CONNECTED || state == State.INITING));
ServiceState.STATE_IN_SERVICE);
} }
@Override @Override
@@ -261,8 +260,7 @@ public final class CdmaDataConnectionTracker extends DataConnectionTracker {
} }
protected String[] getActiveApnTypes() { protected String[] getActiveApnTypes() {
if (mCdmaPhone.mSST.getCurrentCdmaDataConnectionState() == if (state == State.CONNECTED || state == State.INITING) {
ServiceState.STATE_IN_SERVICE) {
return mSupportedApnTypes.clone(); return mSupportedApnTypes.clone();
} }
return new String[0]; return new String[0];
@@ -625,6 +623,15 @@ public final class CdmaDataConnectionTracker extends DataConnectionTracker {
sendMessage(obtainMessage(EVENT_TRY_SETUP_DATA)); sendMessage(obtainMessage(EVENT_TRY_SETUP_DATA));
} }
/**
* @override com.android.intenral.telephony.DataConnectionTracker
*/
@Override
protected void onEnableNewApn() {
// for cdma we only use this when default data is enabled..
onTrySetupData(Phone.REASON_DATA_ENABLED);
}
/** /**
* @override com.android.internal.telephony.DataConnectionTracker * @override com.android.internal.telephony.DataConnectionTracker
*/ */