summaryrefslogtreecommitdiffstats
path: root/telephony
diff options
context:
space:
mode:
authorWink Saville <wink@google.com>2012-03-12 16:00:09 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-03-12 16:00:09 -0700
commit33c67dcb23cd714e11674fa2d70937c66f35d1e1 (patch)
tree87075d7aeb10e7c2ab847600904827c804235c07 /telephony
parented6aa3da03554ece6e8ec8a9e9db024cfaafd292 (diff)
parent2a0eed20b5828877b2db24bf49468e10c3f1b36b (diff)
downloadframeworks_base-33c67dcb23cd714e11674fa2d70937c66f35d1e1.zip
frameworks_base-33c67dcb23cd714e11674fa2d70937c66f35d1e1.tar.gz
frameworks_base-33c67dcb23cd714e11674fa2d70937c66f35d1e1.tar.bz2
am 2a0eed20: am 442612a2: am f4ae6aab: Allow CDMA on LTE devices to get data connections even if otasp is needed.
* commit '2a0eed20b5828877b2db24bf49468e10c3f1b36b': Allow CDMA on LTE devices to get data connections even if otasp is needed.
Diffstat (limited to 'telephony')
-rw-r--r--telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java b/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
index 6e4dd58..5f1a014 100644
--- a/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
+++ b/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
@@ -231,7 +231,8 @@ public final class CdmaDataConnectionTracker extends DataConnectionTracker {
internalDataEnabled &&
desiredPowerState &&
!mPendingRestartRadio &&
- !mCdmaPhone.needsOtaServiceProvisioning();
+ ((mPhone.getLteOnCdmaMode() == Phone.LTE_ON_CDMA_TRUE) ||
+ !mCdmaPhone.needsOtaServiceProvisioning());
if (!allowed && DBG) {
String reason = "";
if (!((psState == ServiceState.STATE_IN_SERVICE) || mAutoAttachOnCreation)) {