diff --git a/src/com/android/settings/fuelgauge/BatteryHistoryChart.java b/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
index a74780d4432..f3e0056bf58 100644
--- a/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
+++ b/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
@@ -59,7 +59,7 @@ public class BatteryHistoryChart extends View {
 
         void init(int width) {
             if (width > 0) {
-                mTicks = new int[width+2];
+                mTicks = new int[width*2];
             } else {
                 mTicks = null;
             }
@@ -68,7 +68,7 @@ public class BatteryHistoryChart extends View {
         }
 
         void addTick(int x, int bin) {
-            if (bin != mLastBin) {
+            if (bin != mLastBin && mNumTicks < mTicks.length) {
                 mTicks[mNumTicks] = x | bin << CHART_DATA_BIN_SHIFT;
                 mNumTicks++;
                 mLastBin = bin;