Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '383e95e245ceb87a2a6ad6422404ce641f0e08eb':
  DropBox: Read until the end of stream has been reached
This commit is contained in:
Brad Fitzpatrick
2010-11-16 09:37:56 -08:00
committed by Android Git Automerger
parent f55c973637 383e95e245
commit 8443dd16c2
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/os/DropBoxManager.java
View File

@@ -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 {