commit 33c67dcb23cd714e11674fa2d70937c66f35d1e1
author Wink Saville <wink@google.com> Mon Mar 12 16:00:09 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Mar 12 16:00:09 2012 -0700
tree 87075d7aeb10e7c2ab847600904827c804235c07
parent ed6aa3da03554ece6e8ec8a9e9db024cfaafd292
parent 2a0eed20b5828877b2db24bf49468e10c3f1b36b

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.

telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java

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 @@
                     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)) {