summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author John Spurlock <jspurlock@google.com> 2013-11-07 05:19:33 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2013-11-07 05:19:33 +0000
commitde46104a3797653f6e564ca3774dc9528dd1ac1e (patch)
tree569f6186bab10c8225a7094fda106a325e856983
parent3c845213e57f8f4be602cdb785490f1b0f44c221 (diff)
parent317c79f80b878a4cbc99979a13a1b3c6cf948767 (diff)
am 317c79f8: Merge "Docfixes for DownloadManager." into klp-docs
* commit '317c79f80b878a4cbc99979a13a1b3c6cf948767': Docfixes for DownloadManager.
-rw-r--r--core/java/android/app/DownloadManager.java16
1 files changed, 6 insertions, 10 deletions
diff --git a/core/java/android/app/DownloadManager.java b/core/java/android/app/DownloadManager.java
index b741cc5c85b3..2ed8b0fbe24c 100644
--- a/core/java/android/app/DownloadManager.java
+++ b/core/java/android/app/DownloadManager.java
@@ -1011,15 +1011,15 @@ public class DownloadManager {
}
/**
- * Returns {@link Uri} for the given downloaded file id, if the file is
- * downloaded successfully. otherwise, null is returned.
+ * Returns the {@link Uri} of the given downloaded file id, if the file is
+ * downloaded successfully. Otherwise, null is returned.
*<p>
* If the specified downloaded file is in external storage (for example, /sdcard dir),
* then it is assumed to be safe for anyone to read and the returned {@link Uri} corresponds
* to the filepath on sdcard.
*
* @param id the id of the downloaded file.
- * @return the {@link Uri} for the given downloaded file id, if download was successful. null
+ * @return the {@link Uri} of the given downloaded file id, if download was successful. null
* otherwise.
*/
public Uri getUriForDownloadedFile(long id) {
@@ -1064,15 +1064,11 @@ public class DownloadManager {
}
/**
- * Returns {@link Uri} for the given downloaded file id, if the file is
- * downloaded successfully. otherwise, null is returned.
- *<p>
- * If the specified downloaded file is in external storage (for example, /sdcard dir),
- * then it is assumed to be safe for anyone to read and the returned {@link Uri} corresponds
- * to the filepath on sdcard.
+ * Returns the media type of the given downloaded file id, if the file was
+ * downloaded successfully. Otherwise, null is returned.
*
* @param id the id of the downloaded file.
- * @return the {@link Uri} for the given downloaded file id, if download was successful. null
+ * @return the media type of the given downloaded file id, if download was successful. null
* otherwise.
*/
public String getMimeTypeForDownloadedFile(long id) {