summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorBookatz <bookatz@google.com>2017-10-10 11:06:33 -0700
committerBookatz <bookatz@google.com>2017-10-10 11:06:33 -0700
commitba78b2bcc73565b68394764ef8a302df64d60fc5 (patch)
tree77991a165f780bdc94e64199e4bdb209a2048a41 /core/java
parentdfa33071066847db5fa8b45ac2e38f99f2f05579 (diff)
Fix parcelling of Kernel Wakelock/reason
In BatteryStatsImpl.java: Previously, if inclUid == false, then kernelWakelockStats and wakeupReasonStats were not printed to the parcel, but only a single 0 was written in their place. In the parcel-reading code, their sizes are read, so if they are not present, there should be a 0 for each of them. In other words, two 0s should be written if they are not present, instead of just 1. Test: none Change-Id: I1d443e9659646f0d30063f275a6a9db42b0a3906
Diffstat (limited to 'core/java')
-rw-r--r--core/java/com/android/internal/os/BatteryStatsImpl.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java
index 36fd991cc78d..dc062f39f72f 100644
--- a/core/java/com/android/internal/os/BatteryStatsImpl.java
+++ b/core/java/com/android/internal/os/BatteryStatsImpl.java
@@ -119,7 +119,7 @@ public class BatteryStatsImpl extends BatteryStats {
private static final int MAGIC = 0xBA757475; // 'BATSTATS'
// Current on-disk Parcel version
- private static final int VERSION = 167 + (USE_OLD_HISTORY ? 1000 : 0);
+ private static final int VERSION = 168 + (USE_OLD_HISTORY ? 1000 : 0);
// Maximum number of items we will record in the history.
private static final int MAX_HISTORY_ITEMS;
@@ -13090,7 +13090,7 @@ public class BatteryStatsImpl extends BatteryStats {
}
}
} else {
- // TODO: There should be two 0's printed here, not just one.
+ out.writeInt(0);
out.writeInt(0);
}