diff options
| author | Ying Wang <wangying@google.com> | 2013-08-23 22:20:03 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2013-08-23 22:20:03 -0700 |
| commit | 94366313331a789440a3c077173aafcb85cabe78 (patch) | |
| tree | 2894afcd4084554ce742e3a32663d533e19e58b9 /core | |
| parent | 14cabdabac1eb87026e4bbd71a18530031b1dd34 (diff) | |
| download | frameworks_base-94366313331a789440a3c077173aafcb85cabe78.zip frameworks_base-94366313331a789440a3c077173aafcb85cabe78.tar.gz frameworks_base-94366313331a789440a3c077173aafcb85cabe78.tar.bz2 | |
Fix docs build.
Change-Id: I3299e59fd90141fee324129ff3b251bdf8f60f10
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/content/ContentResolver.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/core/java/android/content/ContentResolver.java b/core/java/android/content/ContentResolver.java index 1379d1b..a761a89 100644 --- a/core/java/android/content/ContentResolver.java +++ b/core/java/android/content/ContentResolver.java @@ -654,9 +654,9 @@ public abstract class ContentResolver { * @param uri The desired URI to open. * @param mode The file mode to use, as per {@link ContentProvider#openFile * ContentProvider.openFile}. - * @param signal A signal to cancel the operation in progress, or null if - * none. If the operation is canceled, then - * {@link OperationCanceledException} will be thrown. + * @param cancellationSignal A signal to cancel the operation in progress, + * or null if none. If the operation is canceled, then + * {@link OperationCanceledException} will be thrown. * @return Returns a new ParcelFileDescriptor pointing to the file. You * own this descriptor and are responsible for closing it when done. * @throws FileNotFoundException Throws FileNotFoundException if no @@ -781,7 +781,7 @@ public abstract class ContentResolver { * @param uri The desired URI to open. * @param mode The file mode to use, as per {@link ContentProvider#openAssetFile * ContentProvider.openAssetFile}. - * @param signal 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 * {@link OperationCanceledException} will be thrown. * @return Returns a new ParcelFileDescriptor pointing to the file. You @@ -937,9 +937,9 @@ public abstract class ContentResolver { * select a type, though there is no way for you to determine what type * it is returning. * @param opts Additional provider-dependent options. - * @param signal A signal to cancel the operation in progress, or null if - * none. If the operation is canceled, then - * {@link OperationCanceledException} will be thrown. + * @param cancellationSignal A signal to cancel the operation in progress, + * or null if none. If the operation is canceled, then + * {@link OperationCanceledException} will be thrown. * @return Returns a new ParcelFileDescriptor from which you can read the * data stream from the provider. Note that this may be a pipe, meaning * you can't seek in it. The only seek you should do is if the |