commit 19777ff1d18fce7d2c689787098c72bcbd95fe6c
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Oct 16 17:54:39 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 16 17:54:39 2017 +0000
tree 16330d873bac07a0423006cf3ca563e1fdccca78
parent 959516a8858e6d2ff02b5ed48021bd5324d4f912
parent ba78b2bcc73565b68394764ef8a302df64d60fc5

Merge "Fix parcelling of Kernel Wakelock/reason"

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

diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java
index dd07ddb..5c310b1 100644
--- a/core/java/com/android/internal/os/BatteryStatsImpl.java
+++ b/core/java/com/android/internal/os/BatteryStatsImpl.java
@@ -119,7 +119,7 @@
     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 @@
                 }
             }
         } else {
-            // TODO: There should be two 0's printed here, not just one.
+            out.writeInt(0);
             out.writeInt(0);
         }