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

am 799f04c0: Merge "Report data status from ApnContext even if data is detached" into honeycomb-LTE

Browse Source 
* commit '799f04c09cc7284e0660d419bcb24af57b86f08e':
  Report data status from ApnContext even if data is detached
This commit is contained in:
Wink Saville
2011-06-08 15:03:43 -07:00
committed by Android Git Automerger
parent a384ff3282 799f04c09c
commit 2d8500d21a
2 changed files with 5 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
telephony/java/com/android/internal/telephony/cdma/CDMALTEPhone.java
View File

@@ -65,32 +65,12 @@ public class CDMALTEPhone extends CDMAPhone {
@Override
public DataState getDataConnectionState(String apnType) {
// TODO: Remove instanceof if possible.
boolean isCdmaDataConnectionTracker = false;
if (mDataConnectionTracker instanceof CdmaDataConnectionTracker) {
log("getDataConnectionState isCdmaDataConnectionTracker");
isCdmaDataConnectionTracker = true;
} else {
log("getDataConnectionState NOT CdmaDataConnectionTracker");
}
DataState ret = DataState.DISCONNECTED;
if (!isCdmaDataConnectionTracker && (SystemProperties.get("adb.connected", "").length()
> 0)) {
// We're connected to an ADB host and we have USB networking
// turned on. No matter what the radio state is,
// we report data connected
ret = DataState.CONNECTED;
} else if (mSST == null) {
if (mSST == null) {
// Radio Technology Change is ongoning, dispose() and
// removeReferences() have
// already been called
// removeReferences() have already been called
ret = DataState.DISCONNECTED;
} else if (mSST.getCurrentDataConnectionState() != ServiceState.STATE_IN_SERVICE) {
// If we're out of service, open TCP sockets may still work
// but no data will flow
ret = DataState.DISCONNECTED;
} else if (mDataConnectionTracker.isApnTypeEnabled(apnType) == false) {
ret = DataState.DISCONNECTED;

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

@@ -301,6 +301,9 @@ public class GSMPhone extends PhoneBase {
ret = DataState.DISCONNECTED;
} else if (mDataConnectionTracker.isApnTypeEnabled(apnType) == false ||
mDataConnectionTracker.isApnTypeActive(apnType) == false) {
//TODO: isApnTypeActive() is just checking whether ApnContext holds
// Dataconnection or not. Checking each ApnState below should
// provide the same state. Calling isApnTypeActive() can be removed.
ret = DataState.DISCONNECTED;
} else { /* mSST.gprsState == ServiceState.STATE_IN_SERVICE */
switch (mDataConnectionTracker.getState(apnType)) {