diff options
| author | Brad Fitzpatrick <bradfitz@android.com> | 2010-11-16 09:22:31 -0800 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2010-11-16 09:22:31 -0800 |
| commit | 383e95e245ceb87a2a6ad6422404ce641f0e08eb (patch) | |
| tree | bb1c3cdd404deba6761b74a59a128e1742007d42 | |
| parent | db65907a2148f053e51f941979f0f7694acd5923 (diff) | |
| parent | e9f18815218b2ff1f01ea16f2eb0dd17504a9cf3 (diff) | |
| download | frameworks_base-383e95e245ceb87a2a6ad6422404ce641f0e08eb.zip frameworks_base-383e95e245ceb87a2a6ad6422404ce641f0e08eb.tar.gz frameworks_base-383e95e245ceb87a2a6ad6422404ce641f0e08eb.tar.bz2 | |
Merge "DropBox: Read until the end of stream has been reached"
| -rw-r--r-- | core/java/android/os/DropBoxManager.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/core/java/android/os/DropBoxManager.java b/core/java/android/os/DropBoxManager.java index 7889a92..4a0612c 100644 --- 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 { |