diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2019-12-17 19:20:16 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2019-12-17 19:20:16 +0000 |
| commit | f47a64b59dcfffdce5d1080c07a43eb78bbec53b (patch) | |
| tree | 12f3a4f675d78efdeeb1a4ab633e25e2b6ea0236 /core/java | |
| parent | 9d3d79199b935f0276807c53a98953790dbb88f8 (diff) | |
| parent | a4c3162339f31dcfaf904bf2d979c290a8d62e18 (diff) | |
Merge "[Telephony Mainline] Expose MAX_NETWORK_TYPE constant" am: 23019528ec am: a4c3162339
Change-Id: I263fbd69be70ccf48b0e16d00985e716060f6bfa
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/os/BatteryStats.java | 2 | ||||
| -rw-r--r-- | core/java/com/android/internal/os/BatteryStatsImpl.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/os/BatteryStats.java b/core/java/android/os/BatteryStats.java index d016ec4d7c7b..6efe1de4ac45 100644 --- a/core/java/android/os/BatteryStats.java +++ b/core/java/android/os/BatteryStats.java @@ -2421,7 +2421,7 @@ public abstract class BatteryStats implements Parcelable { public static final int DATA_CONNECTION_OUT_OF_SERVICE = 0; public static final int DATA_CONNECTION_EMERGENCY_SERVICE = - TelephonyManager.MAX_NETWORK_TYPE + 1; + TelephonyManager.getAllNetworkTypes().length + 1; public static final int DATA_CONNECTION_OTHER = DATA_CONNECTION_EMERGENCY_SERVICE + 1; diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java index 490787067cef..946a872d7a94 100644 --- a/core/java/com/android/internal/os/BatteryStatsImpl.java +++ b/core/java/com/android/internal/os/BatteryStatsImpl.java @@ -5267,7 +5267,7 @@ public class BatteryStatsImpl extends BatteryStats { // Unknown is included in DATA_CONNECTION_OTHER. int bin = DATA_CONNECTION_OUT_OF_SERVICE; if (hasData) { - if (dataType > 0 && dataType <= TelephonyManager.MAX_NETWORK_TYPE) { + if (dataType > 0 && dataType <= TelephonyManager.getAllNetworkTypes().length) { bin = dataType; } else { switch (serviceType) { |