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

Commit f37635cc authored by xinhe's avatar xinhe Committed by Android Git Automerger
Browse files

am d86df358: Device mobile data is not working though mobile data status... 

am d86df358: Device mobile data is not working though mobile data status indicator shows "H" with full signal

* commit 'd86df358':
  Device mobile data is not working though mobile data status indicator shows "H" with full signal
parents 7c580f7a d86df358

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

+35 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ import java.util.ArrayList; 
import java.util.Arrays;

import java.util.concurrent.atomic.AtomicBoolean;

import java.util.Objects;

import java.lang.StringBuilder;



import android.provider.Settings;
@@ -2234,11 +2235,45 @@ public final class DcTracker extends DcTrackerBase { 
        }

    }



    //check whether the types of two APN same (even only one type of each APN is same)

    private boolean apnTypeSameAny(ApnSetting first, ApnSetting second) {

        if(VDBG) {

            StringBuilder apnType1 = new StringBuilder(first.apn + ": ");

            for(int index1 = 0; index1 < first.types.length; index1++) {

                apnType1.append(first.types[index1]);

                apnType1.append(",");

            }



            StringBuilder apnType2 = new StringBuilder(second.apn + ": ");

            for(int index1 = 0; index1 < second.types.length; index1++) {

                apnType2.append(second.types[index1]);

                apnType2.append(",");

            }

            log("APN1: is " + apnType1);

            log("APN2: is " + apnType2);

        }



        for(int index1 = 0; index1 < first.types.length; index1++) {

            for(int index2 = 0; index2 < second.types.length; index2++) {

                if(first.types[index1].equals(PhoneConstants.APN_TYPE_ALL) ||

                        second.types[index2].equals(PhoneConstants.APN_TYPE_ALL) ||

                        first.types[index1].equals(second.types[index2])) {

                    if(VDBG)log("apnTypeSameAny: return true");

                    return true;

                }

            }

        }



        if(VDBG)log("apnTypeSameAny: return false");

        return false;

    }



    // Check if neither mention DUN and are substantially similar

    private boolean apnsSimilar(ApnSetting first, ApnSetting second) {

        return (first.canHandleType(PhoneConstants.APN_TYPE_DUN) == false &&

                second.canHandleType(PhoneConstants.APN_TYPE_DUN) == false &&

                Objects.equals(first.apn, second.apn) &&

                !apnTypeSameAny(first, second) &&

                xorEquals(first.proxy, second.proxy) &&

                xorEquals(first.port, second.port) &&

                first.carrierEnabled == second.carrierEnabled &&