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

Commit 0de1aba1 authored by Jack Yu's avatar Jack Yu Committed by Gerrit Code Review
Browse files

Merge "Hold on data-stall recovery logic during voice call on other sub."

parents 3106527d 6a2a21bf

src/java/com/android/internal/telephony/dataconnection/DcTracker.java

+13 −2
Original line number Original line Diff line number Diff line
@@ -82,6 +82,7 @@ import com.android.internal.telephony.GsmCdmaPhone; 
import com.android.internal.telephony.ITelephony;

import com.android.internal.telephony.ITelephony;

import com.android.internal.telephony.Phone;

import com.android.internal.telephony.Phone;

import com.android.internal.telephony.PhoneConstants;

import com.android.internal.telephony.PhoneConstants;

import com.android.internal.telephony.PhoneFactory;

import com.android.internal.telephony.RILConstants;

import com.android.internal.telephony.RILConstants;

import com.android.internal.telephony.ServiceStateTracker;

import com.android.internal.telephony.ServiceStateTracker;

import com.android.internal.telephony.TelephonyIntents;

import com.android.internal.telephony.TelephonyIntents;
@@ -98,7 +99,6 @@ import java.util.Arrays; 
import java.util.Comparator;

import java.util.Comparator;

import java.util.HashMap;

import java.util.HashMap;

import java.util.HashSet;

import java.util.HashSet;

import java.util.List;

import java.util.Map.Entry;

import java.util.Map.Entry;

import java.util.Objects;

import java.util.Objects;

import java.util.PriorityQueue;

import java.util.PriorityQueue;
@@ -4739,7 +4739,7 @@ public class DcTracker extends Handler { 
            mSentSinceLastRecv = 0;

            mSentSinceLastRecv = 0;

            putRecoveryAction(RecoveryAction.GET_DATA_CALL_LIST);

            putRecoveryAction(RecoveryAction.GET_DATA_CALL_LIST);

        } else if (sent > 0 && received == 0) {

        } else if (sent > 0 && received == 0) {

            if (mPhone.getState() == PhoneConstants.State.IDLE) {

            if (isPhoneStateIdle()) {

                mSentSinceLastRecv += sent;

                mSentSinceLastRecv += sent;

            } else {

            } else {

                mSentSinceLastRecv = 0;

                mSentSinceLastRecv = 0;
@@ -4757,6 +4757,17 @@ public class DcTracker extends Handler { 
        }

        }

    }

    }





    private boolean isPhoneStateIdle() {

        for (int i = 0; i < TelephonyManager.getDefault().getPhoneCount(); i++) {

            Phone phone = PhoneFactory.getPhone(i);

            if (phone != null && phone.getState() != PhoneConstants.State.IDLE) {

                log("isPhoneStateIdle false: Voice call active on phone " + i);

                return false;

            }

        }

        return true;

    }



    private void onDataStallAlarm(int tag) {

    private void onDataStallAlarm(int tag) {

        if (mDataStallAlarmTag != tag) {

        if (mDataStallAlarmTag != tag) {

            if (DBG) {

            if (DBG) {