Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d5bcfe6 authored by Raph Levien's avatar Raph Levien Committed by Android Git Automerger
Browse files

am d7306c05: am b79413e9: Merge "Fix bug 6930875:... 

am d7306c05: am b79413e9: Merge "Fix bug 6930875: ArrayIndexOutOfBoundsException on Battery details" into jb-mr1-dev

* commit 'd7306c05':
  Fix bug 6930875: ArrayIndexOutOfBoundsException on Battery details
parents b1bdc745 d7306c05

core/java/android/os/BatteryStats.java

+1 −1
Original line number Diff line number Diff line
@@ -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) {