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

Commit 75512400 authored by Daichi Hirono's avatar Daichi Hirono
Browse files

Use AppFuse to write document. 

Previously MtpDocumentsProvider used pipes to transfer bytes from an
application to the provider when writing a document.  The problem was
application could not ensure that the last chunk of bytes was
successfully written to MTP device, since pipes had been already closed
when the provider transferred bytes to MTP device. Though the provider
encountered an error, the provider could not report the error to an
application.

The CL switches the method to transfer bytes from pipes to AppFuse. Now
application can flush() bytes on the file descriptor, and flush will not
complete until the provider completes writing bytes to MTP device.

Fixed: 23093747
Change-Id: I4e28f8cbf19d6c97e591943349a7535241d768f7
parent 7ae60943

src/com/android/documentsui/services/CopyJob.java

+5 −1
Original line number Diff line number Diff line
@@ -45,6 +45,8 @@ import android.os.ParcelFileDescriptor; 
import android.os.RemoteException;

import android.provider.DocumentsContract;

import android.provider.DocumentsContract.Document;

import android.system.ErrnoException;

import android.system.Os;

import android.text.format.DateUtils;

import android.util.Log;

import android.webkit.MimeTypeMap;
@@ -451,7 +453,7 @@ class CopyJob extends Job { 
        ParcelFileDescriptor srcFile = null;

        ParcelFileDescriptor dstFile = null;

        InputStream in = null;

        OutputStream out = null;

        ParcelFileDescriptor.AutoCloseOutputStream out = null;

        boolean success = false;



        try {
@@ -502,6 +504,8 @@ class CopyJob extends Job { 
                    makeCopyProgress(len);

                }



                // Need to invoke IoUtils.close explicitly to avoid from ignoring errors at flush.

                IoUtils.close(dstFile.getFileDescriptor());

                srcFile.checkError();

            } catch (IOException e) {

                throw new ResourceException(