Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "BatteryStats: Fix DivideByZero error"

Browse Source
This commit is contained in:
Adam Lesinski
2016-01-29 20:42:42 +00:00
committed by Android (Google) Code Review
parent 1990221c93 a426817a06
commit 9fa3cd3d86
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/com/android/internal/os/BatteryStatsImpl.java
View File

@@ -8160,7 +8160,7 @@ public final class BatteryStatsImpl extends BatteryStats {
final int size = delta.size();
for (int i = 0; i < size; i++) {
final NetworkStats.Entry entry = delta.getValues(i, mTmpNetworkStatsEntry);
if (entry.rxPackets == 0 || entry.txPackets == 0) {
if (entry.rxPackets == 0 && entry.txPackets == 0) {
continue;
}
@@ -8211,13 +8211,13 @@ public final class BatteryStatsImpl extends BatteryStats {
if (activityInfo != null) {
ControllerActivityCounterImpl activityCounter =
u.getOrCreateModemControllerActivityLocked();
if (entry.rxPackets != 0) {
if (totalRxPackets > 0 && entry.rxPackets > 0) {
final long rxMs = (entry.rxPackets * activityInfo.getRxTimeMillis())
/ totalRxPackets;
activityCounter.getRxTimeCounter().addCountLocked(rxMs);
}
if (entry.txPackets != 0) {
if (totalTxPackets > 0 && entry.txPackets > 0) {
for (int lvl = 0; lvl < ModemActivityInfo.TX_POWER_LEVELS; lvl++) {
long txMs = entry.txPackets * activityInfo.getTxTimeMillis()[lvl];
txMs /= totalTxPackets;