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

Commit 4ce11c92 authored by Corina Grigoras's avatar Corina Grigoras Committed by Automerger Merge Worker
Browse files

Merge "Clarify javadoc about default mode" into udc-dev am: 46b817b6 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22598716



Change-Id: I2e7ea03c2c8a7fd0ffd7c0d5158f9065edf5b787
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f1638f11 46b817b6

core/java/android/content/ContentProvider.java

+10 −5
Original line number Original line Diff line number Diff line
@@ -2085,7 +2085,8 @@ public abstract class ContentProvider implements ContentInterface, ComponentCall 
     *

     *

     * @param uri The URI whose file is to be opened.

     * @param uri The URI whose file is to be opened.

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

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

     *             or "rwt". See{@link ParcelFileDescriptor#parseMode} for more details.

     *             or "rwt". Please note the exact implementation of these may differ for each

     *             Provider implementation - for example, "w" may or may not truncate.

     *

     *

     * @return Returns a new ParcelFileDescriptor which you can use to access

     * @return Returns a new ParcelFileDescriptor which you can use to access

     * the file.

     * the file.
@@ -2147,7 +2148,8 @@ public abstract class ContentProvider implements ContentInterface, ComponentCall 
     *

     *

     * @param uri The URI whose file is to be opened.

     * @param uri The URI whose file is to be opened.

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

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

     *             or "rwt". See{@link ParcelFileDescriptor#parseMode} for more details.

     *             or "rwt". Please note the exact implementation of these may differ for each

     *             Provider implementation - for example, "w" may or may not truncate.

     * @param signal A signal to cancel the operation in progress, or

     * @param signal A signal to cancel the operation in progress, or

     *            {@code null} if none. For example, if you are downloading a

     *            {@code null} if none. For example, if you are downloading a

     *            file from the network to service a "rw" mode request, you

     *            file from the network to service a "rw" mode request, you
@@ -2208,7 +2210,8 @@ public abstract class ContentProvider implements ContentInterface, ComponentCall 
     *

     *

     * @param uri The URI whose file is to be opened.

     * @param uri The URI whose file is to be opened.

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

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

     *             or "rwt". See{@link ParcelFileDescriptor#parseMode} for more details.

     *             or "rwt". Please note the exact implementation of these may differ for each

     *             Provider implementation - for example, "w" may or may not truncate.

     *

     *

     * @return Returns a new AssetFileDescriptor which you can use to access

     * @return Returns a new AssetFileDescriptor which you can use to access

     * the file.

     * the file.
@@ -2262,7 +2265,8 @@ public abstract class ContentProvider implements ContentInterface, ComponentCall 
     *

     *

     * @param uri The URI whose file is to be opened.

     * @param uri The URI whose file is to be opened.

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

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

     *             or "rwt". See{@link ParcelFileDescriptor#parseMode} for more details.

     *             or "rwt". Please note the exact implementation of these may differ for each

     *             Provider implementation - for example, "w" may or may not truncate.

     * @param signal A signal to cancel the operation in progress, or

     * @param signal A signal to cancel the operation in progress, or

     *            {@code null} if none. For example, if you are downloading a

     *            {@code null} if none. For example, if you are downloading a

     *            file from the network to service a "rw" mode request, you

     *            file from the network to service a "rw" mode request, you
@@ -2294,7 +2298,8 @@ public abstract class ContentProvider implements ContentInterface, ComponentCall 
     *

     *

     * @param uri The URI to be opened.

     * @param uri The URI to be opened.

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

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

     *             or "rwt". See{@link ParcelFileDescriptor#parseMode} for more details.

     *             or "rwt". Please note the exact implementation of these may differ for each

     *             Provider implementation - for example, "w" may or may not truncate.

     *

     *

     * @return Returns a new ParcelFileDescriptor that can be used by the

     * @return Returns a new ParcelFileDescriptor that can be used by the

     * client to access the file.

     * client to access the file.

core/java/android/content/ContentResolver.java

+12 −6
Original line number Original line Diff line number Diff line
@@ -1536,7 +1536,8 @@ public abstract class ContentResolver implements ContentInterface { 




    /**

    /**

     * Synonym for {@link #openOutputStream(Uri, String)

     * Synonym for {@link #openOutputStream(Uri, String)

     * openOutputStream(uri, "w")}.

     * openOutputStream(uri, "w")}. Please note the implementation of "w" is up to each

     * Provider implementation and it may or may not truncate.

     *

     *

     * @param uri The desired URI.

     * @param uri The desired URI.

     * @return an OutputStream or {@code null} if the provider recently crashed.

     * @return an OutputStream or {@code null} if the provider recently crashed.
@@ -1562,7 +1563,8 @@ public abstract class ContentResolver implements ContentInterface { 
     *

     *

     * @param uri The desired URI.

     * @param uri The desired URI.

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

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

     *             or "rwt". See{@link ParcelFileDescriptor#parseMode} for more details.

     *             or "rwt". Please note the exact implementation of these may differ for each

     *             Provider implementation - for example, "w" may or may not truncate.

     * @return an OutputStream or {@code null} if the provider recently crashed.

     * @return an OutputStream or {@code null} if the provider recently crashed.

     * @throws FileNotFoundException if the provided URI could not be opened.

     * @throws FileNotFoundException if the provided URI could not be opened.

     * @see #openAssetFileDescriptor(Uri, String)

     * @see #openAssetFileDescriptor(Uri, String)
@@ -1619,7 +1621,8 @@ public abstract class ContentResolver implements ContentInterface { 
     *

     *

     * @param uri The desired URI to open.

     * @param uri The desired URI to open.

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

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

     *             or "rwt". See{@link ParcelFileDescriptor#parseMode} for more details.

     *             or "rwt". Please note the exact implementation of these may differ for each

     *             Provider implementation - for example, "w" may or may not truncate.

     * @return Returns a new ParcelFileDescriptor pointing to the file or {@code null} if the

     * @return Returns a new ParcelFileDescriptor pointing to the file or {@code null} if the

     * provider recently crashed. You own this descriptor and are responsible for closing it

     * provider recently crashed. You own this descriptor and are responsible for closing it

     * when done.

     * when done.
@@ -1662,7 +1665,8 @@ public abstract class ContentResolver implements ContentInterface { 
     *

     *

     * @param uri The desired URI to open.

     * @param uri The desired URI to open.

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

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

     *             or "rwt". See{@link ParcelFileDescriptor#parseMode} for more details.

     *             or "rwt". Please note the exact implementation of these may differ for each

     *             Provider implementation - for example, "w" may or may not truncate.

     * @param cancellationSignal A signal to cancel the operation in progress,

     * @param cancellationSignal A signal to cancel the operation in progress,

     *         or null if none. If the operation is canceled, then

     *         or null if none. If the operation is canceled, then

     *         {@link OperationCanceledException} will be thrown.

     *         {@link OperationCanceledException} will be thrown.
@@ -1756,7 +1760,8 @@ public abstract class ContentResolver implements ContentInterface { 
     *

     *

     * @param uri The desired URI to open.

     * @param uri The desired URI to open.

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

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

     *             or "rwt". See{@link ParcelFileDescriptor#parseMode} for more details.

     *             or "rwt". Please note the exact implementation of these may differ for each

     *             Provider implementation - for example, "w" may or may not truncate.

     * @return Returns a new ParcelFileDescriptor pointing to the file or {@code null} if the

     * @return Returns a new ParcelFileDescriptor pointing to the file or {@code null} if the

     * provider recently crashed. You own this descriptor and are responsible for closing it

     * provider recently crashed. You own this descriptor and are responsible for closing it

     * when done.

     * when done.
@@ -1810,7 +1815,8 @@ public abstract class ContentResolver implements ContentInterface { 
     *

     *

     * @param uri The desired URI to open.

     * @param uri The desired URI to open.

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

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

     *             or "rwt". See{@link ParcelFileDescriptor#parseMode} for more details.

     *             or "rwt". Please note "w" is write only and "wt" is write and truncate.

     *             See{@link ParcelFileDescriptor#parseMode} for more details.

     * @param cancellationSignal A signal to cancel the operation in progress, or null if

     * @param cancellationSignal A signal to cancel the operation in progress, or null if

     *            none. If the operation is canceled, then

     *            none. If the operation is canceled, then

     *            {@link OperationCanceledException} will be thrown.

     *            {@link OperationCanceledException} will be thrown.