am 8443dd16: am 383e95e2: Merge "DropBox: Read until the end of stream has been reached"

* commit '8443dd16c2dfd5f56e33fbe76129f56e6a83b23e':
  DropBox: Read until the end of stream has been reached

1 files changed, 6 insertions, 1 deletions

diff --git a/core/java/android/os/DropBoxManager.java b/core/java/android/os/DropBoxManager.java
index a47c66a75248..47a769693c0d 100644
--- a/core/java/android/os/DropBoxManager.java
+++ b/core/java/android/os/DropBoxManager.java
@@ -169,7 +169,12 @@ public class DropBoxManager {
                 is = getInputStream();
                 if (is == null) return null;
                 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 {