diff options
| author | Richard Ross <toastcfh@gmail.com> | 2012-07-22 19:12:20 -0400 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.cyanogenmod.com> | 2012-12-23 22:50:35 -0800 |
| commit | 844111fe25ce47164d271436209b8199a263c64d (patch) | |
| tree | 24e70d984d7e2f64dbef25e411f7c25416816a4a /src/java/com | |
| parent | 065dd1316dd9c3c23163feaaa1ec337b4a944c1a (diff) | |
| download | frameworks_opt_telephony-844111fe25ce47164d271436209b8199a263c64d.zip frameworks_opt_telephony-844111fe25ce47164d271436209b8199a263c64d.tar.gz frameworks_opt_telephony-844111fe25ce47164d271436209b8199a263c64d.tar.bz2 | |
CdmaLteServiceStateTracker: simultaneous voice and data support on CDMA (e.g: SVDO)
rebased from CM10 commit
Change-Id: I228802b3d2e258892f93e28dbf9dfed8ea8960d1
Diffstat (limited to 'src/java/com')
| -rw-r--r-- | src/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java b/src/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java index 8ec41e3..b4a5dc7 100644 --- a/src/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java +++ b/src/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java @@ -54,7 +54,7 @@ public class CdmaLteServiceStateTracker extends CdmaServiceStateTracker { private final CellInfoLte mCellInfoLte; private ServiceState mLteSS; // The last LTE state from Voice Registration - + private boolean getSVDO = SystemProperties.getBoolean(TelephonyProperties.PROPERTY_SVDATA, false); private CellIdentityLte mNewCellIdentityLte = new CellIdentityLte(); private CellIdentityLte mLasteCellIdentityLte = new CellIdentityLte(); @@ -562,11 +562,13 @@ public class CdmaLteServiceStateTracker extends CdmaServiceStateTracker { @Override public boolean isConcurrentVoiceAndDataAllowed() { // For non-LTE, look at the CSS indicator to check on SV capability - if (mRilRadioTechnology == ServiceState.RIL_RADIO_TECHNOLOGY_LTE) { + if (mRilRadioTechnology == ServiceState.RIL_RADIO_TECHNOLOGY_LTE) return true; - } else { + else if ((getSVDO) && (mLteSS.getRadioTechnology() != + ServiceState.RIL_RADIO_TECHNOLOGY_1xRTT)) + return true; + else return ss.getCssIndicator() == 1; - } } /** |