diff options
| author | Conley Owens <cco3@android.com> | 2011-04-29 16:44:14 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-04-29 16:44:14 -0700 |
| commit | 5eb49e0f1e8e03e8808d8d7da6d5ffb761400e0b (patch) | |
| tree | 8e4e9d4a0fa9cd02196e253af60420222e2a8001 | |
| parent | ba40174bc02f35aa2f6339a04de4f8993f2cd750 (diff) | |
| parent | e321d06430304fa93282c765aa6070c908121a16 (diff) | |
| download | frameworks_base-5eb49e0f1e8e03e8808d8d7da6d5ffb761400e0b.zip frameworks_base-5eb49e0f1e8e03e8808d8d7da6d5ffb761400e0b.tar.gz frameworks_base-5eb49e0f1e8e03e8808d8d7da6d5ffb761400e0b.tar.bz2 | |
am e321d064: am 2f463ef1: Merge "Adding a sanity test in the while loop in readHistory()"
* commit 'e321d06430304fa93282c765aa6070c908121a16':
Adding a sanity test in the while loop in readHistory()
| -rw-r--r-- | core/java/com/android/internal/os/BatteryStatsImpl.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java index d86504d..2847cf3 100644 --- a/core/java/com/android/internal/os/BatteryStatsImpl.java +++ b/core/java/com/android/internal/os/BatteryStatsImpl.java @@ -4708,7 +4708,7 @@ public final class BatteryStatsImpl extends BatteryStats { mHistory = mHistoryEnd = mHistoryCache = null; mHistoryBaseTime = 0; long time; - while ((time=in.readLong()) >= 0) { + while (in.dataAvail() > 0 && (time=in.readLong()) >= 0) { HistoryItem rec = new HistoryItem(time, in); addHistoryRecordLocked(rec); if (rec.time > mHistoryBaseTime) { |