diff options
| author | Amith Yamasani <yamasani@google.com> | 2010-04-05 14:20:57 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-05 14:20:57 -0700 |
| commit | 733a2f654934d452b2febf6f80cd1136830758d5 (patch) | |
| tree | f4907ad70c1dd1bf3b00f5f2213b2898cfcf20c9 /core/java/com | |
| parent | 6c9356028cc94259c9d1f5f937d9cca1f45914d3 (diff) | |
| parent | 1b4c0d702066794b9ce97b02721aa9e552997381 (diff) | |
| download | frameworks_base-733a2f654934d452b2febf6f80cd1136830758d5.zip frameworks_base-733a2f654934d452b2febf6f80cd1136830758d5.tar.gz frameworks_base-733a2f654934d452b2febf6f80cd1136830758d5.tar.bz2 | |
am 1b4c0d70: Merge "Fix a crash in BatteryStatsImpl, due to a previous fix." into froyo
Merge commit '1b4c0d702066794b9ce97b02721aa9e552997381' into froyo-plus-aosp
* commit '1b4c0d702066794b9ce97b02721aa9e552997381':
Fix a crash in BatteryStatsImpl, due to a previous fix.
Diffstat (limited to 'core/java/com')
| -rw-r--r-- | core/java/com/android/internal/os/BatteryStatsImpl.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java index 833c01b..aadb576 100644 --- 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; |