summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Adam Lesinski <adamlesinski@google.com> 2016-02-25 18:23:02 -0800
committer Adam Lesinski <adamlesinski@google.com> 2016-02-25 18:24:28 -0800
commit6cca414de21e515e1db4164b15b33355c724cf1a (patch)
tree401a5dac8edc60db297621bfbceb42dbe0deae2a
parentab9a9b09fdd9b8c9f666149f9840a09a97b91885 (diff)
BatteryStats: Fix issue where network traffic accounting might be lost
Both bytes transmitted and received must be 0 if we are to short circuit and ignore the UID's network delta. Change-Id: Ia69f605c7d5954b8f2c3671bab596dc9925f1d02
-rw-r--r--core/java/com/android/internal/os/BatteryStatsImpl.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java
index 648b1a54927d..3ea139752aaf 100644
--- a/core/java/com/android/internal/os/BatteryStatsImpl.java
+++ b/core/java/com/android/internal/os/BatteryStatsImpl.java
@@ -8056,7 +8056,8 @@ public final class BatteryStatsImpl extends BatteryStats {
+ " txPackets=" + entry.txPackets);
}
- if (entry.rxBytes == 0 || entry.txBytes == 0) {
+ if (entry.rxBytes == 0 && entry.txBytes == 0) {
+ // Skip the lookup below since there is no work to do.
continue;
}