commit d61b61d6f97f9f73b86e4a24a747c4451f2bc939
author Amith Yamasani <yamasani@google.com> Tue Nov 22 11:04:58 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Nov 22 11:04:58 2011 -0800
tree 087bf34feab81a201b998911e30fb41b1f81a8d9
parent b8ee50eece1481110721cb4e93a54c03fbf77d27
parent 227a64fe23b4e6f05dc31e5f51b0f4c142e52b18

am 227a64fe: Merge "Fix an NPE on overflow in BatteryStats history." into ics-mr1

* commit '227a64fe23b4e6f05dc31e5f51b0f4c142e52b18':
  Fix an NPE on overflow in BatteryStats history.

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 3e96c81..fec4cbc 100644
--- a/core/java/com/android/internal/os/BatteryStatsImpl.java
+++ b/core/java/com/android/internal/os/BatteryStatsImpl.java
@@ -1275,7 +1275,7 @@
             // record changes to the battery level.
             if (mHistoryLastWritten.batteryLevel == mHistoryCur.batteryLevel &&
                     (dataSize >= MAX_MAX_HISTORY_BUFFER
-                            || ((mHistoryEnd.states^mHistoryCur.states)
+                            || ((mHistoryLastWritten.states^mHistoryCur.states)
                                     & HistoryItem.MOST_INTERESTING_STATES) == 0)) {
                 return;
             }