Merge "DropBox: Read until the end of stream has been reached"

2010-11-16 09:22:31 -08:00
parent db65907a21 e9f1881521
commit 383e95e245
1 changed files with 6 additions and 1 deletions
--- a/core/java/android/os/DropBoxManager.java
+++ b/core/java/android/os/DropBoxManager.java
@@ -150,7 +150,12 @@ public class DropBoxManager {
            try {
                is = getInputStream();
                byte[] buf = new byte[maxBytes];
-                return new String(buf, 0, Math.max(0, is.read(buf)));
+                int readBytes = 0;
+                int n = 0;
+                while (n >= 0 && (readBytes += n) < maxBytes) {
+                    n = is.read(buf, readBytes, maxBytes - readBytes);
+                }
+                return new String(buf, 0, readBytes);
            } catch (IOException e) {
                return null;
            } finally {