diff options
| author | Shareef Ali <shareefalis@cyanogenmod.org> | 2013-07-08 20:30:58 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2013-07-08 20:30:58 -0700 |
| commit | af90c1e2bc09f59dbe753a7e8d5f9e6103f2a2f9 (patch) | |
| tree | 77d6b7d569e5a58bf962947ab3b62b8abcfb70f7 | |
| parent | f5114b479928d0b6869c6bbd2a3fbeb0f90af79e (diff) | |
| parent | abae5e73f67540a55741a1c87084d3407de8d9fb (diff) | |
| download | frameworks_opt_telephony-af90c1e2bc09f59dbe753a7e8d5f9e6103f2a2f9.zip frameworks_opt_telephony-af90c1e2bc09f59dbe753a7e8d5f9e6103f2a2f9.tar.gz frameworks_opt_telephony-af90c1e2bc09f59dbe753a7e8d5f9e6103f2a2f9.tar.bz2 | |
Merge "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." into cm-10.1
| -rw-r--r-- | src/java/com/android/internal/telephony/cdma/CdmaCallTracker.java | 6 | ||||
| -rw-r--r-- | src/java/com/android/internal/telephony/gsm/GsmCallTracker.java | 6 |
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; |