diff options
| author | Raph Levien <raph@google.com> | 2012-08-03 18:00:52 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-08-03 18:00:53 -0700 |
| commit | b79413e92d46b9d12b628a60e1cefa2e34ab9d3d (patch) | |
| tree | b829812a369eb77cf6ff12b6f15f364a4bd39e37 | |
| parent | da806b5c5fb804328d9de06e998b76dc00a8b223 (diff) | |
| parent | 4c7a4a776741ddaa49df1361aa3a8f3977e59196 (diff) | |
| download | frameworks_base-b79413e92d46b9d12b628a60e1cefa2e34ab9d3d.zip frameworks_base-b79413e92d46b9d12b628a60e1cefa2e34ab9d3d.tar.gz frameworks_base-b79413e92d46b9d12b628a60e1cefa2e34ab9d3d.tar.bz2 | |
Merge "Fix bug 6930875: ArrayIndexOutOfBoundsException on Battery details" into jb-mr1-dev
| -rw-r--r-- | core/java/android/os/BatteryStats.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/os/BatteryStats.java b/core/java/android/os/BatteryStats.java index 1bb27bd..fcc0ae4 100644 --- a/core/java/android/os/BatteryStats.java +++ b/core/java/android/os/BatteryStats.java @@ -1705,7 +1705,7 @@ public abstract class BatteryStats implements Parcelable { if (u.hasUserActivity()) { boolean hasData = false; - for (int i=0; i<NUM_SCREEN_BRIGHTNESS_BINS; i++) { + for (int i=0; i<Uid.NUM_USER_ACTIVITY_TYPES; i++) { int val = u.getUserActivityCount(i, which); if (val != 0) { if (!hasData) { |