Merge "Un-@hide new download manager public API." into gingerbread (7feab347) · Commits · e / os / android_frameworks_base

api/current.xml

+561 −0

Original line number	Diff line number	Diff line
		@@ -92749,6 +92749,567 @@
		>
		</field>
		</class>
		<class name="DownloadManager"
		extends="java.lang.Object"
		abstract="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<method name="enqueue"
		return="long"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="request" type="android.net.DownloadManager.Request">
		</parameter>
		</method>
		<method name="openDownloadedFile"
		return="android.os.ParcelFileDescriptor"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="id" type="long">
		</parameter>
		<exception name="FileNotFoundException" type="java.io.FileNotFoundException">
		</exception>
		</method>
		<method name="query"
		return="android.database.Cursor"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="query" type="android.net.DownloadManager.Query">
		</parameter>
		</method>
		<method name="remove"
		return="void"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="id" type="long">
		</parameter>
		</method>
		<field name="ACTION_DOWNLOAD_COMPLETE"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""android.intent.action.DOWNLOAD_COMPLETE""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="ACTION_NOTIFICATION_CLICKED"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""android.intent.action.DOWNLOAD_NOTIFICATION_CLICKED""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="COLUMN_BYTES_DOWNLOADED_SO_FAR"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""bytes_so_far""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="COLUMN_DESCRIPTION"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""description""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="COLUMN_ERROR_CODE"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""error_code""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="COLUMN_ID"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""id""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="COLUMN_LAST_MODIFIED_TIMESTAMP"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""last_modified_timestamp""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="COLUMN_LOCAL_URI"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""local_uri""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="COLUMN_MEDIA_TYPE"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""media_type""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="COLUMN_STATUS"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""status""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="COLUMN_TITLE"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""title""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="COLUMN_TOTAL_SIZE_BYTES"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""total_size""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="COLUMN_URI"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""uri""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="ERROR_DEVICE_NOT_FOUND"
		type="int"
		transient="false"
		volatile="false"
		value="1007"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="ERROR_FILE_ERROR"
		type="int"
		transient="false"
		volatile="false"
		value="1001"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="ERROR_HTTP_DATA_ERROR"
		type="int"
		transient="false"
		volatile="false"
		value="1004"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="ERROR_INSUFFICIENT_SPACE"
		type="int"
		transient="false"
		volatile="false"
		value="1006"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="ERROR_TOO_MANY_REDIRECTS"
		type="int"
		transient="false"
		volatile="false"
		value="1005"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="ERROR_UNHANDLED_HTTP_CODE"
		type="int"
		transient="false"
		volatile="false"
		value="1002"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="ERROR_UNKNOWN"
		type="int"
		transient="false"
		volatile="false"
		value="1000"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="EXTRA_DOWNLOAD_ID"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""extra_download_id""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="STATUS_FAILED"
		type="int"
		transient="false"
		volatile="false"
		value="16"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="STATUS_PAUSED"
		type="int"
		transient="false"
		volatile="false"
		value="4"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="STATUS_PENDING"
		type="int"
		transient="false"
		volatile="false"
		value="1"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="STATUS_RUNNING"
		type="int"
		transient="false"
		volatile="false"
		value="2"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="STATUS_SUCCESSFUL"
		type="int"
		transient="false"
		volatile="false"
		value="8"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		</class>
		<class name="DownloadManager.Query"
		extends="java.lang.Object"
		abstract="false"
		static="true"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<constructor name="DownloadManager.Query"
		type="android.net.DownloadManager.Query"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</constructor>
		<method name="setFilterById"
		return="android.net.DownloadManager.Query"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="id" type="long">
		</parameter>
		</method>
		<method name="setFilterByStatus"
		return="android.net.DownloadManager.Query"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="flags" type="int">
		</parameter>
		</method>
		</class>
		<class name="DownloadManager.Request"
		extends="java.lang.Object"
		abstract="false"
		static="true"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<constructor name="DownloadManager.Request"
		type="android.net.DownloadManager.Request"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="uri" type="android.net.Uri">
		</parameter>
		</constructor>
		<method name="setAllowedNetworkTypes"
		return="android.net.DownloadManager.Request"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="flags" type="int">
		</parameter>
		</method>
		<method name="setAllowedOverRoaming"
		return="android.net.DownloadManager.Request"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="allowed" type="boolean">
		</parameter>
		</method>
		<method name="setDescription"
		return="android.net.DownloadManager.Request"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="description" type="java.lang.String">
		</parameter>
		</method>
		<method name="setDestinationUri"
		return="android.net.DownloadManager.Request"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="uri" type="android.net.Uri">
		</parameter>
		</method>
		<method name="setMediaType"
		return="android.net.DownloadManager.Request"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="mediaType" type="java.lang.String">
		</parameter>
		</method>
		<method name="setRequestHeader"
		return="android.net.DownloadManager.Request"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="header" type="java.lang.String">
		</parameter>
		<parameter name="value" type="java.lang.String">
		</parameter>
		</method>
		<method name="setShowNotification"
		return="android.net.DownloadManager.Request"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="flags" type="int">
		</parameter>
		</method>
		<method name="setTitle"
		return="android.net.DownloadManager.Request"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="title" type="java.lang.String">
		</parameter>
		</method>
		<field name="NETWORK_MOBILE"
		type="int"
		transient="false"
		volatile="false"
		value="1"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="NETWORK_WIFI"
		type="int"
		transient="false"
		volatile="false"
		value="2"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="NETWORK_WIMAX"
		type="int"
		transient="false"
		volatile="false"
		value="4"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="NOTIFICATION_WHEN_RUNNING"
		type="int"
		transient="false"
		volatile="false"
		value="1"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		</class>
		<class name="LocalServerSocket"
		extends="java.lang.Object"
		abstract="false"

core/java/android/content/Context.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -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";

core/java/android/net/DownloadManager.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -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 {
		/**