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
This commit is contained in:
Bookatz
2017-10-10 11:06:33 -07:00
parent dfa3307106
commit ba78b2bcc7

View File

@@ -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);
}