summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWink Saville <wink@google.com>2012-03-12 15:57:44 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-03-12 15:57:44 -0700
commit2a0eed20b5828877b2db24bf49468e10c3f1b36b (patch)
tree8f88da7378946bf4060eb89de945d07c93e873db
parentea374096511f92206c264f3f1eb0551a05a34cd5 (diff)
parent442612a273981a1b21fdb2e9c19a887ab710224d (diff)
downloadframeworks_base-2a0eed20b5828877b2db24bf49468e10c3f1b36b.zip
frameworks_base-2a0eed20b5828877b2db24bf49468e10c3f1b36b.tar.gz
frameworks_base-2a0eed20b5828877b2db24bf49468e10c3f1b36b.tar.bz2
am 442612a2: am f4ae6aab: Allow CDMA on LTE devices to get data connections even if otasp is needed.
* commit '442612a273981a1b21fdb2e9c19a887ab710224d': Allow CDMA on LTE devices to get data connections even if otasp is needed.
-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 26a028b..0a1b1e4 100644
--- a/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
+++ b/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
@@ -226,7 +226,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)) {