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

am ddae8936: Merge "Remove redundent getCurrentCdmaDataConnectionState" into honeycomb-LTE

Browse Source 
* commit 'ddae89368129397c8df55bcdef9fcf36e4ff5fa5':
  Remove redundent getCurrentCdmaDataConnectionState
This commit is contained in:
Robert Greenwalt
2011-06-01 09:12:07 -07:00
committed by Android Git Automerger
parent c691d7f9a3 ddae893681
commit 903cd57f67
4 changed files with 5 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -87,7 +87,7 @@ public class CDMALTEPhone extends CDMAPhone {
// already been called // already been called
ret = DataState.DISCONNECTED; ret = DataState.DISCONNECTED;
} else if (mSST.getCurrentCdmaDataConnectionState() != ServiceState.STATE_IN_SERVICE) { } else if (mSST.getCurrentDataConnectionState() != ServiceState.STATE_IN_SERVICE) {
// If we're out of service, open TCP sockets may still work // If we're out of service, open TCP sockets may still work
// but no data will flow // but no data will flow
ret = DataState.DISCONNECTED; ret = DataState.DISCONNECTED;

4
telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java
View File

@@ -337,7 +337,7 @@ public class CDMAPhone extends PhoneBase {
public DataActivityState getDataActivityState() { public DataActivityState getDataActivityState() {
DataActivityState ret = DataActivityState.NONE; DataActivityState ret = DataActivityState.NONE;
if (mSST.getCurrentCdmaDataConnectionState() == ServiceState.STATE_IN_SERVICE) { if (mSST.getCurrentDataConnectionState() == ServiceState.STATE_IN_SERVICE) {
switch (mDataConnectionTracker.getActivity()) { switch (mDataConnectionTracker.getActivity()) {
case DATAIN: case DATAIN:
@@ -618,7 +618,7 @@ public class CDMAPhone extends PhoneBase {
// already been called // already been called
ret = DataState.DISCONNECTED; ret = DataState.DISCONNECTED;
} else if (mSST.getCurrentCdmaDataConnectionState() != ServiceState.STATE_IN_SERVICE) { } else if (mSST.getCurrentDataConnectionState() != ServiceState.STATE_IN_SERVICE) {
// If we're out of service, open TCP sockets may still work // If we're out of service, open TCP sockets may still work
// but no data will flow // but no data will flow
ret = DataState.DISCONNECTED; ret = DataState.DISCONNECTED;

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

@@ -175,7 +175,7 @@ public final class CdmaDataConnectionTracker extends DataConnectionTracker {
@Override @Override
protected boolean isDataAllowed() { protected boolean isDataAllowed() {
int psState = mCdmaPhone.mSST.getCurrentCdmaDataConnectionState(); int psState = mCdmaPhone.mSST.getCurrentDataConnectionState();
boolean roaming = (mPhone.getServiceState().getRoaming() && !getDataOnRoamingEnabled()); boolean roaming = (mPhone.getServiceState().getRoaming() && !getDataOnRoamingEnabled());
boolean desiredPowerState = mCdmaPhone.mSST.getDesiredPowerState(); boolean desiredPowerState = mCdmaPhone.mSST.getDesiredPowerState();
@@ -258,7 +258,7 @@ public final class CdmaDataConnectionTracker extends DataConnectionTracker {
return true; return true;
} }
int psState = mCdmaPhone.mSST.getCurrentCdmaDataConnectionState(); int psState = mCdmaPhone.mSST.getCurrentDataConnectionState();
boolean roaming = mPhone.getServiceState().getRoaming(); boolean roaming = mPhone.getServiceState().getRoaming();
boolean desiredPowerState = mCdmaPhone.mSST.getDesiredPowerState(); boolean desiredPowerState = mCdmaPhone.mSST.getDesiredPowerState();

12
telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
View File

@@ -1217,18 +1217,6 @@ public class CdmaServiceStateTracker extends ServiceStateTracker {
} }
} }
/**
* @return The current CDMA data connection state. ServiceState.RADIO_TECHNOLOGY_1xRTT or
* ServiceState.RADIO_TECHNOLOGY_EVDO is the same as "attached" and
* ServiceState.RADIO_TECHNOLOGY_UNKNOWN is the same as detached.
*/
/*package*/ int getCurrentCdmaDataConnectionState() {
return mDataConnectionState;
}
/**
* TODO: In the future, we need remove getCurrentCdmaDataConnectionState
*/
public int getCurrentDataConnectionState() { public int getCurrentDataConnectionState() {
return mDataConnectionState; return mDataConnectionState;
} }