summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSeth Shelnutt <shelnutt2@gmail.com>2013-07-03 22:52:56 -0400
committerSeth Shelnutt <shelnutt2@gmail.com>2013-07-04 08:14:01 -0400
commitabae5e73f67540a55741a1c87084d3407de8d9fb (patch)
tree5b3c56320ab688dd6d84755c7303d580f8d0ba7f /src
parent11e0766529b665788c632636d5498e644ff82dd0 (diff)
downloadframeworks_opt_telephony-abae5e73f67540a55741a1c87084d3407de8d9fb.zip
frameworks_opt_telephony-abae5e73f67540a55741a1c87084d3407de8d9fb.tar.gz
frameworks_opt_telephony-abae5e73f67540a55741a1c87084d3407de8d9fb.tar.bz2
CallTracker: Add additional check for pendingMO to verify that a dial is
happening and we are expecting a call to appear when repeated polling of GET_CURRENT_CALLS. Change-Id: Id719ed79e47462d898299e1468f0a1b9e00b43f8
Diffstat (limited to 'src')
-rw-r--r--src/java/com/android/internal/telephony/cdma/CdmaCallTracker.java6
-rw-r--r--src/java/com/android/internal/telephony/gsm/GsmCallTracker.java6
2 files changed, 6 insertions, 6 deletions
diff --git a/src/java/com/android/internal/telephony/cdma/CdmaCallTracker.java b/src/java/com/android/internal/telephony/cdma/CdmaCallTracker.java
index 196e795..ad671d3 100644
--- a/src/java/com/android/internal/telephony/cdma/CdmaCallTracker.java
+++ b/src/java/com/android/internal/telephony/cdma/CdmaCallTracker.java
@@ -77,7 +77,7 @@ public final class CdmaCallTracker extends CallTracker {
boolean hangupPendingMO;
//Used to re-request the list of current calls
- boolean slow_modem = (SystemProperties.getInt("ro.telephony.slow_modem",0) != 0);
+ boolean slowModem = (SystemProperties.getInt("ro.telephony.slowModem",0) != 0);
boolean pendingCallInEcm=false;
boolean mIsInEmergencyCall = false;
@@ -500,8 +500,8 @@ public final class CdmaCallTracker extends CallTracker {
boolean needsPollDelay = false;
boolean unknownConnectionAppeared = false;
- if (slow_modem) {
- if (polledCalls.size() == 0 && !hangupPendingMO){
+ if (slowModem) {
+ if (polledCalls.size() == 0 && !hangupPendingMO && pendingMO != null) {
lastRelevantPoll = obtainMessage(EVENT_POLL_CALLS_RESULT);
cm.getCurrentCalls(lastRelevantPoll);
return;
diff --git a/src/java/com/android/internal/telephony/gsm/GsmCallTracker.java b/src/java/com/android/internal/telephony/gsm/GsmCallTracker.java
index c2d1640..1ebc902 100644
--- a/src/java/com/android/internal/telephony/gsm/GsmCallTracker.java
+++ b/src/java/com/android/internal/telephony/gsm/GsmCallTracker.java
@@ -82,7 +82,7 @@ public final class GsmCallTracker extends CallTracker {
boolean hangupPendingMO;
//Used to re-request the list of current calls
- boolean slow_modem = (SystemProperties.getInt("ro.telephony.slow_modem",0) != 0);
+ boolean slowModem = (SystemProperties.getInt("ro.telephony.slowModem",0) != 0);
GSMPhone phone;
@@ -435,8 +435,8 @@ public final class GsmCallTracker extends CallTracker {
boolean needsPollDelay = false;
boolean unknownConnectionAppeared = false;
- if (slow_modem) {
- if (polledCalls.size() == 0 && !hangupPendingMO){
+ if (slowModem) {
+ if (polledCalls.size() == 0 && !hangupPendingMO && pendingMO != null) {
lastRelevantPoll = obtainMessage(EVENT_POLL_CALLS_RESULT);
cm.getCurrentCalls(lastRelevantPoll);
return;