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

Commit c72081d7 authored by Siddharth Ray's avatar Siddharth Ray
Browse files

New cellular network types 

New cellular network types (cellular data registration states) are added.

When cellular network type is "IWLAN" and the phone is on, call is VoWifi.
The only exception is when the following conditions hold
- Verizon sim card
- 1x coverage only
- Wifi is connected
In this case calls go over cellular (cdma 1x).

BUG:67013665

Test: Manual
Change-Id: Id90445c899547bdac003a2cbbfa8cd78060750f2
parent f5e796a0

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
@@ -5283,6 +5283,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;