am 7c600369: Merge "Update Context.getSystemService() docs for download manager." into gingerbread

Merge commit '7c600369c9695de73ca37db552eb81b8b89d5e76' into gingerbread-plus-aosp

* commit '7c600369c9695de73ca37db552eb81b8b89d5e76':
  Update Context.getSystemService() docs for download manager.
This commit is contained in:
Steve Howard
2010-07-30 11:12:28 -07:00
committed by Android Git Automerger

View File

@ -1206,6 +1206,8 @@ public abstract class Context {
* for management of input methods. * for management of input methods.
* <dt> {@link #UI_MODE_SERVICE} ("uimode") * <dt> {@link #UI_MODE_SERVICE} ("uimode")
* <dd> An {@link android.app.UiModeManager} for controlling UI modes. * <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> * </dl>
* *
* <p>Note: System services obtained via this API may be closely associated with * <p>Note: System services obtained via this API may be closely associated with
@ -1253,6 +1255,8 @@ public abstract class Context {
* @see android.view.inputmethod.InputMethodManager * @see android.view.inputmethod.InputMethodManager
* @see #UI_MODE_SERVICE * @see #UI_MODE_SERVICE
* @see android.app.UiModeManager * @see android.app.UiModeManager
* @see #DOWNLOAD_SERVICE
* @see android.net.DownloadManager
*/ */
public abstract Object getSystemService(String name); public abstract Object getSystemService(String name);