diff options
| author | 2018-02-13 11:31:54 -0800 | |
|---|---|---|
| committer | 2018-02-13 12:12:16 -0800 | |
| commit | c72081d762fc4f0a0479c45406b39ded9a15cbc1 (patch) | |
| tree | bf6e02fee9f096d2add2d3eb8ce6571e354f44d5 | |
| parent | f5e796a07062a4972d6c0946f978053d07d5dddf (diff) | |
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
| -rw-r--r-- | core/java/android/os/BatteryStats.java | 8 | ||||
| -rw-r--r-- | core/java/com/android/internal/os/BatteryStatsImpl.java | 12 |
2 files changed, 18 insertions, 2 deletions
diff --git a/core/java/android/os/BatteryStats.java b/core/java/android/os/BatteryStats.java index 5d7cf1e3899f..7cd58e8b7c36 100644 --- a/core/java/android/os/BatteryStats.java +++ b/core/java/android/os/BatteryStats.java @@ -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; diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java index f380f909a167..99e5a1841493 100644 --- a/core/java/com/android/internal/os/BatteryStatsImpl.java +++ b/core/java/com/android/internal/os/BatteryStatsImpl.java @@ -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; |