diff options
| author | Peter Wang <tpwang@google.com> | 2019-11-25 12:00:12 -0800 |
|---|---|---|
| committer | Peter Wang <tpwang@google.com> | 2019-12-13 15:36:17 -0800 |
| commit | 2dae34155ed3aa2476d9f07bc33d536fc4d270dd (patch) | |
| tree | bae86c6cd202cb61a4fbb62e8770864e3a19d263 /core/java | |
| parent | c5480019cebe08ac5ed6f5d6c6b011aa1872df13 (diff) | |
[Telephony Mainline] Expose MAX_NETWORK_TYPE constant
Test: Build
Bug: 140908357
Change-Id: I40cbcdfb8e77b3e01968d008f4359790c4264539
Merged-In: I40cbcdfb8e77b3e01968d008f4359790c4264539
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 427474c2962a..c859f1109cf2 100644 --- a/core/java/com/android/internal/os/BatteryStatsImpl.java +++ b/core/java/com/android/internal/os/BatteryStatsImpl.java @@ -5266,7 +5266,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) { |