Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48c05739 authored by Steve Howard's avatar Steve Howard Committed by Android Git Automerger
Browse files

am 6a114b21: am 7c600369: Merge "Update Context.getSystemService() docs for... 

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

Merge commit '6a114b21'

* commit '6a114b21':
  Update Context.getSystemService() docs for download manager.
parents 01f51d36 6a114b21

core/java/android/content/Context.java

+4 −0
Original line number Diff line number Diff line
@@ -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);