Merge "continue read file when returned count > 0" am: 894c578a02

am: 2a82e9a69c

Change-Id: I2880bdc9157996d30472e3eddb714c498b14e66b

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);