diff options
| author | Steve Howard <showard@google.com> | 2010-07-30 11:15:44 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-30 11:15:44 -0700 |
| commit | 48c05739dd7e58552fb5b856c243edc692e9c456 (patch) | |
| tree | 89746186ea675e441b554098fdbe8c9d98736c50 /core/java/android/content/Context.java | |
| parent | 01f51d3645b00889013fe91091d49cb9d3e137da (diff) | |
| parent | 6a114b211a77bdd4f4c687f99f9e5f9273ec1a76 (diff) | |
| download | frameworks_base-48c05739dd7e58552fb5b856c243edc692e9c456.zip frameworks_base-48c05739dd7e58552fb5b856c243edc692e9c456.tar.gz frameworks_base-48c05739dd7e58552fb5b856c243edc692e9c456.tar.bz2 | |
am 6a114b21: am 7c600369: Merge "Update Context.getSystemService() docs for download manager." into gingerbread
Merge commit '6a114b211a77bdd4f4c687f99f9e5f9273ec1a76'
* commit '6a114b211a77bdd4f4c687f99f9e5f9273ec1a76':
Update Context.getSystemService() docs for download manager.
Diffstat (limited to 'core/java/android/content/Context.java')
| -rw-r--r-- | core/java/android/content/Context.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index 879103e..24c0305 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -1234,6 +1234,8 @@ public abstract class Context { * for management of input methods. * <dt> {@link #UI_MODE_SERVICE} ("uimode") * <dd> An {@link android.app.UiModeManager} for controlling UI modes. + * <dt> {@link #DOWNLOAD_SERVICE} ("download") + * <dd> A {@link android.net.DownloadManager} for requesting HTTP downloads * </dl> * * <p>Note: System services obtained via this API may be closely associated with @@ -1281,6 +1283,8 @@ public abstract class Context { * @see android.view.inputmethod.InputMethodManager * @see #UI_MODE_SERVICE * @see android.app.UiModeManager + * @see #DOWNLOAD_SERVICE + * @see android.net.DownloadManager */ public abstract Object getSystemService(String name); |