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

Commit e4adba74 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "telus" 

* changes:
  SUPL server for Telus
  New cellular network types
parents 100d494b 37a9dab6

core/java/android/os/BatteryStats.java

+6 −2
Original line number Diff line number Diff line
@@ -2240,12 +2240,16 @@ public abstract class BatteryStats implements Parcelable { 
    public static final int DATA_CONNECTION_LTE = 13;

    public static final int DATA_CONNECTION_EHRPD = 14;

    public static final int DATA_CONNECTION_HSPAP = 15;

    public static final int DATA_CONNECTION_OTHER = 16;

    public static final int DATA_CONNECTION_GSM = 16;

    public static final int DATA_CONNECTION_TD_SCDMA = 17;

    public static final int DATA_CONNECTION_IWLAN = 18;

    public static final int DATA_CONNECTION_LTE_CA = 19;

    public static final int DATA_CONNECTION_OTHER = 20;



    static final String[] DATA_CONNECTION_NAMES = {

        "none", "gprs", "edge", "umts", "cdma", "evdo_0", "evdo_A",

        "1xrtt", "hsdpa", "hsupa", "hspa", "iden", "evdo_b", "lte",

        "ehrpd", "hspap", "other"

        "ehrpd", "hspap", "gsm", "td_scdma", "iwlan", "lte_ca", "other"

    };



    public static final int NUM_DATA_CONNECTION_TYPES = DATA_CONNECTION_OTHER+1;

core/java/com/android/internal/os/BatteryStatsImpl.java

+12 −0
Original line number Diff line number Diff line
@@ -5286,6 +5286,18 @@ public class BatteryStatsImpl extends BatteryStats { 
                case TelephonyManager.NETWORK_TYPE_HSPAP:

                    bin = DATA_CONNECTION_HSPAP;

                    break;

                case TelephonyManager.NETWORK_TYPE_GSM:

                    bin = DATA_CONNECTION_GSM;

                    break;

                case TelephonyManager.NETWORK_TYPE_TD_SCDMA:

                    bin = DATA_CONNECTION_TD_SCDMA;

                    break;

                case TelephonyManager.NETWORK_TYPE_IWLAN:

                    bin = DATA_CONNECTION_IWLAN;

                    break;

                case TelephonyManager.NETWORK_TYPE_LTE_CA:

                    bin = DATA_CONNECTION_LTE_CA;

                    break;

                default:

                    bin = DATA_CONNECTION_OTHER;

                    break;

core/res/res/values-mcc302-mnc220/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 


    <!-- Values for GPS configuration (Telus) -->

    <string-array translatable="false" name="config_gpsParameters">

        <item>SUPL_HOST=supl.telusmobility.com</item>

        <item>SUPL_HOST=supl.google.com</item>

        <item>SUPL_PORT=7275</item>

        <item>SUPL_VER=0x20000</item>

        <item>SUPL_MODE=1</item>

core/res/res/values-mcc302-mnc221/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 


    <!-- Values for GPS configuration (Telus) -->

    <string-array translatable="false" name="config_gpsParameters">

        <item>SUPL_HOST=supl.telusmobility.com</item>

        <item>SUPL_HOST=supl.google.com</item>

        <item>SUPL_PORT=7275</item>

        <item>SUPL_VER=0x20000</item>

        <item>SUPL_MODE=1</item>