diff options
| author | Brad Fitzpatrick <bradfitz@android.com> | 2010-11-16 09:37:56 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-11-16 09:37:56 -0800 |
| commit | 8443dd16c2dfd5f56e33fbe76129f56e6a83b23e (patch) | |
| tree | 67282306c3dd6faa396fd2a493af21bd9f567972 | |
| parent | f55c973637f2b17de0f5543260e7e409a8635112 (diff) | |
| parent | 383e95e245ceb87a2a6ad6422404ce641f0e08eb (diff) | |
| download | frameworks_base-8443dd16c2dfd5f56e33fbe76129f56e6a83b23e.zip frameworks_base-8443dd16c2dfd5f56e33fbe76129f56e6a83b23e.tar.gz frameworks_base-8443dd16c2dfd5f56e33fbe76129f56e6a83b23e.tar.bz2 | |
am 383e95e2: Merge "DropBox: Read until the end of stream has been reached"
* commit '383e95e245ceb87a2a6ad6422404ce641f0e08eb':
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 a47c66a..47a7696 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 { |