summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2019-03-13 07:36:51 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2019-03-13 07:36:51 +0000
commit894c578a023b49e1b7852dea8629520b6d66d27e (patch)
treeb268d2aa53b4f103f202994938403dcfdacaec50
parentda0ebedb47f9c1c7a6d49c506ff789aa45b175c6 (diff)
parentbaff465f668aff2d4b5b410ad28a40138b423323 (diff)
Merge "continue read file when returned count > 0"
-rw-r--r--core/java/com/android/internal/os/KernelWakelockReader.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/core/java/com/android/internal/os/KernelWakelockReader.java b/core/java/com/android/internal/os/KernelWakelockReader.java
index 46667d1ea688..86b2a90dd64e 100644
--- a/core/java/com/android/internal/os/KernelWakelockReader.java
+++ b/core/java/com/android/internal/os/KernelWakelockReader.java
@@ -66,7 +66,7 @@ public class KernelWakelockReader {
*/
public final KernelWakelockStats readKernelWakelockStats(KernelWakelockStats staleStats) {
byte[] buffer = new byte[32*1024];
- int len;
+ int len = 0;
boolean wakeup_sources;
final long startTime = SystemClock.uptimeMillis();
@@ -87,7 +87,11 @@ public class KernelWakelockReader {
}
}
- len = is.read(buffer);
+ int cnt;
+ while ((cnt = is.read(buffer, len, buffer.length - len)) > 0) {
+ len += cnt;
+ }
+
is.close();
} catch (java.io.IOException e) {
Slog.wtf(TAG, "failed to read kernel wakelocks", e);