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

Commit 5aae0c9d authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Utility methods useful for working with files. 

Part of getting DocumentsUI ready for building against public API.

Test: builds
Bug: 110959821
Change-Id: I7cc0acd5ac3bcc89790cb49f34291ae523e44019
parent 0b5f738f

api/current.txt

+20 −4
Original line number Diff line number Diff line
@@ -9137,6 +9137,7 @@ package android.content { 
    method public android.os.Bundle call(java.lang.String, java.lang.String, android.os.Bundle) throws android.os.RemoteException;

    method public final android.net.Uri canonicalize(android.net.Uri) throws android.os.RemoteException;

    method public void close();

    method public static void closeQuietly(android.content.ContentProviderClient);

    method public int delete(android.net.Uri, java.lang.String, java.lang.String[]) throws android.os.RemoteException;

    method public android.content.ContentProvider getLocalContentProvider();

    method public java.lang.String[] getStreamTypes(android.net.Uri, java.lang.String) throws android.os.RemoteException;
@@ -32547,6 +32548,21 @@ package android.os { 
    ctor public FileUriExposedException(java.lang.String);

  }













  public class FileUtils {













    method public static void closeQuietly(java.lang.AutoCloseable);













    method public static void closeQuietly(java.io.FileDescriptor);













    method public static long copy(java.io.File, java.io.File) throws java.io.IOException;













    method public static long copy(java.io.File, java.io.File, android.os.CancellationSignal, java.util.concurrent.Executor, android.os.FileUtils.ProgressListener) throws java.io.IOException;













    method public static long copy(java.io.InputStream, java.io.OutputStream) throws java.io.IOException;













    method public static long copy(java.io.InputStream, java.io.OutputStream, android.os.CancellationSignal, java.util.concurrent.Executor, android.os.FileUtils.ProgressListener) throws java.io.IOException;













    method public static long copy(java.io.FileDescriptor, java.io.FileDescriptor) throws java.io.IOException;













    method public static long copy(java.io.FileDescriptor, java.io.FileDescriptor, android.os.CancellationSignal, java.util.concurrent.Executor, android.os.FileUtils.ProgressListener) throws java.io.IOException;













  }

























  public static abstract interface FileUtils.ProgressListener {













    method public abstract void onProgress(long);













  }



























  public class Handler {















    ctor public Handler();















    ctor public Handler(android.os.Handler.Callback);










@@ -42510,13 +42526,11 @@ package android.telephony {













    method public java.lang.String getIccAuthentication(int, int, java.lang.String);















    method public java.lang.String getImei();















    method public java.lang.String getImei(int);













    method public java.lang.String getTypeAllocationCode();













    method public java.lang.String getTypeAllocationCode(int);















    method public java.lang.String getLine1Number();













    method public java.lang.String getMeid();













    method public java.lang.String getMeid(int);















    method public java.lang.String getManufacturerCode();















    method public java.lang.String getManufacturerCode(int);













    method public java.lang.String getMeid();













    method public java.lang.String getMeid(int);















    method public java.lang.String getMmsUAProfUrl();















    method public java.lang.String getMmsUserAgent();















    method public java.lang.String getNai();









@@ -42539,6 +42553,8 @@ package android.telephony {













    method public int getSimState();















    method public int getSimState(int);















    method public java.lang.String getSubscriberId();













    method public java.lang.String getTypeAllocationCode();













    method public java.lang.String getTypeAllocationCode(int);















    method public java.lang.String getVisualVoicemailPackageName();















    method public java.lang.String getVoiceMailAlphaTag();















    method public java.lang.String getVoiceMailNumber();

























core/java/android/content/ContentProviderClient.java



+11
−6




























Original line number
Diff line number
Diff line








@@ -39,6 +39,8 @@ import com.android.internal.util.Preconditions;





























import dalvik.system.CloseGuard;





























import libcore.io.IoUtils;





























import java.io.FileNotFoundException;















import java.util.ArrayList;















import java.util.concurrent.atomic.AtomicBoolean;










@@ -560,14 +562,17 @@ public class ContentProviderClient implements AutoCloseable {













        return ContentProvider.coerceToLocalContentProvider(mContentProvider);















    }





























    /**













     * Closes the given object quietly, ignoring any checked exceptions. Does













     * nothing if the given object is {@code null}.













     */













    public static void closeQuietly(ContentProviderClient client) {













        IoUtils.closeQuietly(client);













    }





























    /** {@hide} */















    public static void releaseQuietly(ContentProviderClient client) {













        if (client != null) {













            try {













                client.release();













            } catch (Exception ignored) {













            }













        }













        IoUtils.closeQuietly(client);















    }































    private class NotRespondingRunnable implements Runnable {

































core/java/android/os/FileUtils.java



+192
−64


























File changed.
Preview size limit exceeded, changes collapsed.
























core/java/android/print/PrintFileDocumentAdapter.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -118,7 +118,7 @@ public class PrintFileDocumentAdapter extends PrintDocumentAdapter {













        protected Void doInBackground(Void... params) {















            try (InputStream in = new FileInputStream(mFile);















                    OutputStream out = new FileOutputStream(mDestination.getFileDescriptor())) {













                FileUtils.copy(in, out, null, mCancellationSignal);













                FileUtils.copy(in, out, mCancellationSignal, null, null);















            } catch (OperationCanceledException e) {















                // Ignored; already handled below















            } catch (IOException e) {

































core/java/android/provider/DocumentsContract.java



+2
−1




























Original line number
Diff line number
Diff line








@@ -100,7 +100,8 @@ public final class DocumentsContract {













    public static final String PROVIDER_INTERFACE = "android.content.action.DOCUMENTS_PROVIDER";































    /** {@hide} */













    public static final String EXTRA_PACKAGE_NAME = "android.content.extra.PACKAGE_NAME";













    @Deprecated













    public static final String EXTRA_PACKAGE_NAME = Intent.EXTRA_PACKAGE_NAME;































    /** {@hide} */















    public static final String EXTRA_SHOW_ADVANCED = "android.content.extra.SHOW_ADVANCED";