Merge "Fix a crash in BatteryStatsImpl, due to a previous fix." into froyo

2010-04-05 14:17:55 -07:00
parent 44dcf65871 e5795610bd
commit 1b4c0d7020
1 changed files with 4 additions and 1 deletions
--- a/core/java/com/android/internal/os/BatteryStatsImpl.java
+++ b/core/java/com/android/internal/os/BatteryStatsImpl.java
@@ -891,7 +891,10 @@ public final class BatteryStatsImpl extends BatteryStats {
                for (endIndex=startIndex; 
                        endIndex < len && wlBuffer[endIndex] != '\n' && wlBuffer[endIndex] != '\0'; 
                        endIndex++);
-                endIndex++; // endIndex is an exclusive upper bound.
+                // 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;