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

Commit c62f2e1b authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "FileBridge needs to keep strong reference to PFD." into lmp-dev

parents f8a823b0 9a1507aa

core/java/android/content/pm/PackageInstaller.java

+1 −1
Original line number Diff line number Diff line
@@ -623,7 +623,7 @@ public class PackageInstaller { 
            try {

                final ParcelFileDescriptor clientSocket = mSession.openWrite(name,

                        offsetBytes, lengthBytes);

                return new FileBridge.FileBridgeOutputStream(clientSocket.getFileDescriptor());

                return new FileBridge.FileBridgeOutputStream(clientSocket);

            } catch (RuntimeException e) {

                ExceptionUtils.maybeUnwrapIOException(e);

                throw e;

core/java/android/os/FileBridge.java

+4 −2
Original line number Diff line number Diff line
@@ -131,11 +131,13 @@ public class FileBridge extends Thread { 
    }



    public static class FileBridgeOutputStream extends OutputStream {

        private final ParcelFileDescriptor mClientPfd;

        private final FileDescriptor mClient;

        private final byte[] mTemp = new byte[MSG_LENGTH];



        public FileBridgeOutputStream(FileDescriptor client) {

            mClient = client;

        public FileBridgeOutputStream(ParcelFileDescriptor clientPfd) {

            mClientPfd = clientPfd;

            mClient = clientPfd.getFileDescriptor();

        }



        @Override