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

am fdda2746: Merge change 27304 into eclair

Browse Source 
Merge commit 'fdda2746d83f08452953e154bdc1314544afc2bd' into eclair-plus-aosp

* commit 'fdda2746d83f08452953e154bdc1314544afc2bd':
  Fix Cdma re-start of default connection.
This commit is contained in:
Robert Greenwalt
2009-09-27 16:53:48 -07:00
committed by Android Git Automerger
parent aecb8a007c fdda2746d8
commit fcc381b174
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
protected boolean isApnTypeActive(String type) {
return (isApnTypeAvailable(type) &&
mCdmaPhone.mSST.getCurrentCdmaDataConnectionState() ==
ServiceState.STATE_IN_SERVICE);
(state == State.CONNECTED || state == State.INITING));
}
@Override
@@ -261,8 +260,7 @@ public final class CdmaDataConnectionTracker extends DataConnectionTracker {
}
protected String[] getActiveApnTypes() {
if (mCdmaPhone.mSST.getCurrentCdmaDataConnectionState() ==
ServiceState.STATE_IN_SERVICE) {
if (state == State.CONNECTED || state == State.INITING) {
return mSupportedApnTypes.clone();
}
return new String[0];
@@ -625,6 +623,15 @@ public final class CdmaDataConnectionTracker extends DataConnectionTracker {
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
*/