diff options
| author | Patrick Tjin <pattjin@google.com> | 2013-11-06 18:12:47 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-11-06 18:12:47 +0000 |
| commit | bd9513f3b27a9a15a12474ff5b270abd69a013a1 (patch) | |
| tree | 17aab18c488103e0473691653026e5034ccc61b1 /core | |
| parent | 6fe15c3d5f1b2759b06f3ce489071bb7708d7f6b (diff) | |
| parent | b71703cfdfbac35a6e5afaa437d073cf835c25db (diff) | |
| download | frameworks_base-bd9513f3b27a9a15a12474ff5b270abd69a013a1.zip frameworks_base-bd9513f3b27a9a15a12474ff5b270abd69a013a1.tar.gz frameworks_base-bd9513f3b27a9a15a12474ff5b270abd69a013a1.tar.bz2 | |
Merge "Add HSPA+ to BatteryStats" into klp-dev
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/os/BatteryStats.java | 5 | ||||
| -rw-r--r-- | core/java/com/android/internal/os/BatteryStatsImpl.java | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/core/java/android/os/BatteryStats.java b/core/java/android/os/BatteryStats.java index dbaa325..7ae8ca8 100644 --- a/core/java/android/os/BatteryStats.java +++ b/core/java/android/os/BatteryStats.java @@ -844,12 +844,13 @@ public abstract class BatteryStats implements Parcelable { public static final int DATA_CONNECTION_EVDO_B = 12; public static final int DATA_CONNECTION_LTE = 13; public static final int DATA_CONNECTION_EHRPD = 14; - public static final int DATA_CONNECTION_OTHER = 15; + public static final int DATA_CONNECTION_HSPAP = 15; + public static final int DATA_CONNECTION_OTHER = 16; static final String[] DATA_CONNECTION_NAMES = { "none", "gprs", "edge", "umts", "cdma", "evdo_0", "evdo_A", "1xrtt", "hsdpa", "hsupa", "hspa", "iden", "evdo_b", "lte", - "ehrpd", "other" + "ehrpd", "hspap", "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 e0a154c..a99aa33 100644 --- a/core/java/com/android/internal/os/BatteryStatsImpl.java +++ b/core/java/com/android/internal/os/BatteryStatsImpl.java @@ -2172,6 +2172,9 @@ public final class BatteryStatsImpl extends BatteryStats { case TelephonyManager.NETWORK_TYPE_EHRPD: bin = DATA_CONNECTION_EHRPD; break; + case TelephonyManager.NETWORK_TYPE_HSPAP: + bin = DATA_CONNECTION_HSPAP; + break; default: bin = DATA_CONNECTION_OTHER; break; |