summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorSteve Howard <showard@google.com>2010-07-27 16:29:37 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-07-27 16:29:37 -0700
commit7feab3470156c7864fe159115d575c16f0974493 (patch)
tree85bd81dd27515415b4db898fdb5df438386d8fb4 /core
parent10f7c1b8ecf110fd9c646eb3fcb51e6ee74c5885 (diff)
parent46be2a5bb647a2429c16ce7d613dd9cce8c3c43b (diff)
downloadframeworks_base-7feab3470156c7864fe159115d575c16f0974493.zip
frameworks_base-7feab3470156c7864fe159115d575c16f0974493.tar.gz
frameworks_base-7feab3470156c7864fe159115d575c16f0974493.tar.bz2
Merge "Un-@hide new download manager public API." into gingerbread
Diffstat (limited to 'core')
-rw-r--r--core/java/android/content/Context.java1
-rw-r--r--core/java/android/net/DownloadManager.java2
2 files changed, 0 insertions, 3 deletions
diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java
index e3b7731..7951a30 100644
--- a/core/java/android/content/Context.java
+++ b/core/java/android/content/Context.java
@@ -1538,7 +1538,6 @@ public abstract class Context {
* {@link android.net.DownloadManager} for requesting HTTP downloads.
*
* @see #getSystemService
- * @hide (TODO) for now
*/
public static final String DOWNLOAD_SERVICE = "download";
diff --git a/core/java/android/net/DownloadManager.java b/core/java/android/net/DownloadManager.java
index 455bd36..1d88c18 100644
--- a/core/java/android/net/DownloadManager.java
+++ b/core/java/android/net/DownloadManager.java
@@ -42,8 +42,6 @@ import java.util.Set;
* Instances of this class should be obtained through
* {@link android.content.Context#getSystemService(String)} by passing
* {@link android.content.Context#DOWNLOAD_SERVICE}.
- *
- * @hide
*/
public class DownloadManager {
/**