Merge "Fix parcelling of Kernel Wakelock/reason" (19777ff1) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/os/BatteryStatsImpl.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;
		@@ -13118,7 +13118,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);
		}