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

Commit 3cd801dc authored by Garfield Tan's avatar Garfield Tan Committed by android-build-merger
Browse files

Merge "Specify behavior around DocumentsProvider#openDocument()." into oc-dev 

am: 146e8f41

Change-Id: I014761972a0803a1865dd6c18a95cfeacec7beb4
parents fc945bf6 146e8f41

core/java/android/os/ParcelFileDescriptor.java

+2 −1
Original line number Diff line number Diff line
@@ -547,7 +547,8 @@ public class ParcelFileDescriptor implements Parcelable, Closeable { 
     * Converts a string representing a file mode, such as "rw", into a bitmask suitable for use

     * with {@link #open}.

     * <p>

     * @param mode The string representation of the file mode.

     * @param mode The string representation of the file mode. Can be "r", "w", "wt", "wa", "rw"

     *             or "rwt".

     * @return A bitmask representing the given file mode.

     * @throws IllegalArgumentException if the given string does not match a known file mode.

     */

core/java/android/provider/DocumentsProvider.java

+6 −2
Original line number Diff line number Diff line
@@ -655,8 +655,12 @@ public abstract class DocumentsProvider extends ContentProvider { 
     * <p>

     * Your provider should return a reliable {@link ParcelFileDescriptor} to

     * detect when the remote caller has finished reading or writing the

     * document. You may return a pipe or socket pair if the mode is exclusively

     * "r" or "w", but complex modes like "rw" imply a normal file on disk that

     * document.

     * <p>

     * Mode "r" should always be supported. Provider should throw

     * {@link UnsupportedOperationException} if the passing mode is not supported.

     * You may return a pipe or socket pair if the mode is exclusively "r" or

     * "w", but complex modes like "rw" imply a normal file on disk that

     * supports seeking.

     * <p>

     * If you block while downloading content, you should periodically check