From 916adce02d5b37038cd78d11a8c884237684f9a8 Mon Sep 17 00:00:00 2001 From: Dianne Hackborn Date: Tue, 19 Oct 2010 16:23:53 -0700 Subject: [PATCH] Fix issue #3108683: GRH18: Battery usage chart FCs Make array more bigger, and bounds check the thing. Change-Id: Iaffebefd27c16c6ecf57566803859be1a5049b8a --- src/com/android/settings/fuelgauge/BatteryHistoryChart.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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;