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

Commit c778f71d authored by Amith Yamasani's avatar Amith Yamasani Committed by Android Git Automerger
Browse files

am 733a2f65: am 1b4c0d70: Merge "Fix a crash in BatteryStatsImpl, due to a... 

am 733a2f65: am 1b4c0d70: Merge "Fix a crash in BatteryStatsImpl, due to a previous fix." into froyo

Merge commit '733a2f65' into kraken

* commit '733a2f65':
  Fix a crash in BatteryStatsImpl, due to a previous fix.
parents 507748e9 733a2f65

core/java/com/android/internal/os/BatteryStatsImpl.java

+4 −1
Original line number Diff line number Diff line
@@ -891,7 +891,10 @@ public final class BatteryStatsImpl extends BatteryStats { 
                for (endIndex=startIndex; 

                        endIndex < len && wlBuffer[endIndex] != '\n' && wlBuffer[endIndex] != '\0'; 

                        endIndex++);

                // Don't go over the end of the buffer

                if (endIndex < len) {

                    endIndex++; // endIndex is an exclusive upper bound.

                }



                String[] nameStringArray = mProcWakelocksName;

                long[] wlData = mProcWakelocksData;