Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e9f18815 authored by Christian Lindeberg's avatar Christian Lindeberg Committed by Johan Redestig
Browse files

DropBox: Read until the end of stream has been reached 

Read the requested length or until the end of the input stream
has actually been reached.

Change-Id: I01bc0b81eca0225209bdd288dde6a778a19d1e2c
parent 9de93424

core/java/android/os/DropBoxManager.java

+6 −1
Original line number Diff line number Diff line
@@ -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 {