summaryrefslogtreecommitdiffstats
path: root/telephony
diff options
context:
space:
mode:
authoryoonsung.nam <yoonsung.nam@samsung.com>2011-08-17 20:28:24 -0700
committerJohn Huang <jsh@google.com>2011-08-25 16:24:25 -0700
commitbcfa57ba529835adb1995894698146fbad64c21e (patch)
tree867a948a87063afd9de770cdae2cb67dde98a7f2 /telephony
parentf60ac6307e07b409faea9f2506aa8c7162d11a4f (diff)
downloadframeworks_base-bcfa57ba529835adb1995894698146fbad64c21e.zip
frameworks_base-bcfa57ba529835adb1995894698146fbad64c21e.tar.gz
frameworks_base-bcfa57ba529835adb1995894698146fbad64c21e.tar.bz2
Allow data during voice call if network type is LTE
Change-Id: Ibbf327ed709c8429232eb4e9088fe900a2e87980 Signed-off-by: yoonsung.nam <yoonsung.nam@samsung.com>
Diffstat (limited to 'telephony')
-rw-r--r--telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
index c8671c1..00fb0e0 100644
--- a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
+++ b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
@@ -576,7 +576,8 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
boolean allowed =
(gprsState == ServiceState.STATE_IN_SERVICE || mAutoAttachOnCreation) &&
mPhone.mIccRecords.getRecordsLoaded() &&
- mPhone.getState() == Phone.State.IDLE &&
+ (mPhone.getState() == Phone.State.IDLE ||
+ mPhone.getServiceStateTracker().isConcurrentVoiceAndDataAllowed()) &&
internalDataEnabled &&
(!mPhone.getServiceState().getRoaming() || getDataOnRoamingEnabled()) &&
!mIsPsRestricted &&
@@ -587,8 +588,10 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
reason += " - gprs= " + gprsState;
}
if (!mPhone.mIccRecords.getRecordsLoaded()) reason += " - SIM not loaded";
- if (mPhone.getState() != Phone.State.IDLE) {
+ if (mPhone.getState() != Phone.State.IDLE &&
+ !mPhone.getServiceStateTracker().isConcurrentVoiceAndDataAllowed()) {
reason += " - PhoneState= " + mPhone.getState();
+ reason += " - Concurrent voice and data not allowed";
}
if (!internalDataEnabled) reason += " - mInternalDataEnabled= false";
if (mPhone.getServiceState().getRoaming() && !getDataOnRoamingEnabled()) {