Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af90c1e2 authored by Shareef Ali's avatar Shareef Ali Committed by Gerrit Code Review
Browse files

Merge "CallTracker: Add additional check for pendingMO to verify that a dial... 

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
parents f5114b47 abae5e73

src/java/com/android/internal/telephony/cdma/CdmaCallTracker.java

+3 −3
Original line number Diff line number Diff line
@@ -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;

src/java/com/android/internal/telephony/gsm/GsmCallTracker.java

+3 −3
Original line number Diff line number Diff line
@@ -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;