From 1cf2077c3762349f4838ab041e6a06363ebd0b26 Mon Sep 17 00:00:00 2001 From: Dianne Hackborn Date: Sun, 10 Aug 2014 16:32:08 -0700 Subject: [PATCH] Fix issues in Settings: 16660423, 13172381, 16868094 Issue #16660423: Stability: ArrayIndexOutOfBoundsException in settings: at com.android.settings.fuelgauge.BatteryHistoryChart$ChartData.draw( BatteryHistoryChart.java:109) Issue #13172381: No content description in Battery charging section Issue #16868094: Settings crash on switching to landscape mode with "Google Text-to-speech" settings icon selected Change-Id: I94d0e83f72d571eb90aad6742acabce56c0298ec --- .../android/settings/fuelgauge/BatteryHistoryChart.java | 9 ++++++++- .../android/settings/tts/TtsEngineSettingsFragment.java | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/fuelgauge/BatteryHistoryChart.java b/src/com/android/settings/fuelgauge/BatteryHistoryChart.java index d88c5161f02..9d3edd55c81 100644 --- a/src/com/android/settings/fuelgauge/BatteryHistoryChart.java +++ b/src/com/android/settings/fuelgauge/BatteryHistoryChart.java @@ -86,7 +86,7 @@ public class BatteryHistoryChart extends View { void addTick(int x, int bin) { if (bin != mLastBin && mNumTicks < mTicks.length) { - mTicks[mNumTicks] = x | bin << CHART_DATA_BIN_SHIFT; + mTicks[mNumTicks] = (x&CHART_DATA_X_MASK) | (bin<