diff options
author | Robert Greenwalt <rgreenwalt@google.com> | 2011-05-26 16:37:20 -0700 |
---|---|---|
committer | Robert Greenwalt <rgreenwalt@google.com> | 2011-05-31 16:25:58 -0700 |
commit | a4e82851e9c8a75dfb371403c500e3b3cf3e4565 (patch) | |
tree | 08fe191c28baba0419bf9f7bba3ecbbbff556a88 /telephony | |
parent | 425f2a6d71b3af058630367d75b0b924bf1aee49 (diff) | |
download | frameworks_base-a4e82851e9c8a75dfb371403c500e3b3cf3e4565.zip frameworks_base-a4e82851e9c8a75dfb371403c500e3b3cf3e4565.tar.gz frameworks_base-a4e82851e9c8a75dfb371403c500e3b3cf3e4565.tar.bz2 |
Remove redundent getCurrentCdmaDataConnectionState
replace with existing and generic getCurrentDataConnectionState.
bug:3487138
Change-Id: I8a5e85afd316252eedeacb2a042450124702defd
Diffstat (limited to 'telephony')
4 files changed, 5 insertions, 17 deletions
diff --git a/telephony/java/com/android/internal/telephony/cdma/CDMALTEPhone.java b/telephony/java/com/android/internal/telephony/cdma/CDMALTEPhone.java index 586e6b3..5733164 100644 --- a/telephony/java/com/android/internal/telephony/cdma/CDMALTEPhone.java +++ b/telephony/java/com/android/internal/telephony/cdma/CDMALTEPhone.java @@ -87,7 +87,7 @@ public class CDMALTEPhone extends CDMAPhone { // already been called 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 // but no data will flow ret = DataState.DISCONNECTED; diff --git a/telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java b/telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java index 4fa369c..c85f7d8 100755 --- a/telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java +++ b/telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java @@ -337,7 +337,7 @@ public class CDMAPhone extends PhoneBase { public DataActivityState getDataActivityState() { DataActivityState ret = DataActivityState.NONE; - if (mSST.getCurrentCdmaDataConnectionState() == ServiceState.STATE_IN_SERVICE) { + if (mSST.getCurrentDataConnectionState() == ServiceState.STATE_IN_SERVICE) { switch (mDataConnectionTracker.getActivity()) { case DATAIN: @@ -618,7 +618,7 @@ public class CDMAPhone extends PhoneBase { // already been called 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 // but no data will flow ret = DataState.DISCONNECTED; diff --git a/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java b/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java index e3e3d78..8ce221a 100644 --- a/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java +++ b/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java @@ -175,7 +175,7 @@ public final class CdmaDataConnectionTracker extends DataConnectionTracker { @Override protected boolean isDataAllowed() { - int psState = mCdmaPhone.mSST.getCurrentCdmaDataConnectionState(); + int psState = mCdmaPhone.mSST.getCurrentDataConnectionState(); boolean roaming = (mPhone.getServiceState().getRoaming() && !getDataOnRoamingEnabled()); boolean desiredPowerState = mCdmaPhone.mSST.getDesiredPowerState(); @@ -258,7 +258,7 @@ public final class CdmaDataConnectionTracker extends DataConnectionTracker { return true; } - int psState = mCdmaPhone.mSST.getCurrentCdmaDataConnectionState(); + int psState = mCdmaPhone.mSST.getCurrentDataConnectionState(); boolean roaming = mPhone.getServiceState().getRoaming(); boolean desiredPowerState = mCdmaPhone.mSST.getDesiredPowerState(); diff --git a/telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java b/telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java index 0fd0614..56b335e 100755 --- a/telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java +++ b/telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java @@ -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() { return mDataConnectionState; } |