diff options
| -rw-r--r-- | api/current.xml | 1234 | ||||
| -rw-r--r-- | core/java/android/app/ContextImpl.java | 1 | ||||
| -rw-r--r-- | core/java/android/app/DownloadManager.java (renamed from core/java/android/net/DownloadManager.java) | 4 | ||||
| -rw-r--r-- | core/java/android/content/Context.java | 6 | ||||
| -rw-r--r-- | core/tests/coretests/src/android/app/DownloadManagerBaseTest.java (renamed from core/tests/coretests/src/android/net/DownloadManagerBaseTest.java) | 8 | ||||
| -rw-r--r-- | core/tests/coretests/src/android/app/DownloadManagerIntegrationTest.java (renamed from core/tests/coretests/src/android/net/DownloadManagerIntegrationTest.java) | 12 | ||||
| -rw-r--r-- | core/tests/coretests/src/android/app/DownloadManagerStressTest.java (renamed from core/tests/coretests/src/android/net/DownloadManagerStressTest.java) | 7 | ||||
| -rw-r--r-- | core/tests/hosttests/test-apps/DownloadManagerTestApp/Android.mk | 2 | ||||
| -rw-r--r-- | core/tests/hosttests/test-apps/DownloadManagerTestApp/src/com/android/frameworks/DownloadManagerTestApp.java | 8 |
9 files changed, 642 insertions, 640 deletions
diff --git a/api/current.xml b/api/current.xml index 876fe00..179c515 100644 --- a/api/current.xml +++ b/api/current.xml @@ -24488,6 +24488,623 @@ </parameter> </method> </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.app.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.app.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="ACTION_VIEW_DOWNLOADS" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.intent.action.VIEW_DOWNLOADS"" + 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_CANNOT_RESUME" + type="int" + transient="false" + volatile="false" + value="1008" + 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_ALREADY_EXISTS" + type="int" + transient="false" + volatile="false" + value="1009" + 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.app.DownloadManager.Query" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</constructor> +<method name="setFilterById" + return="android.app.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.app.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.app.DownloadManager.Request" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="uri" type="android.net.Uri"> +</parameter> +</constructor> +<method name="addRequestHeader" + return="android.app.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="setAllowedNetworkTypes" + return="android.app.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.app.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.app.DownloadManager.Request" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="description" type="java.lang.CharSequence"> +</parameter> +</method> +<method name="setDestinationInExternalFilesDir" + return="android.app.DownloadManager.Request" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="context" type="android.content.Context"> +</parameter> +<parameter name="dirType" type="java.lang.String"> +</parameter> +<parameter name="subPath" type="java.lang.String"> +</parameter> +</method> +<method name="setDestinationInExternalPublicDir" + return="android.app.DownloadManager.Request" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="dirType" type="java.lang.String"> +</parameter> +<parameter name="subPath" type="java.lang.String"> +</parameter> +</method> +<method name="setDestinationUri" + return="android.app.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="setMimeType" + return="android.app.DownloadManager.Request" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="mimeType" type="java.lang.String"> +</parameter> +</method> +<method name="setShowRunningNotification" + return="android.app.DownloadManager.Request" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="show" type="boolean"> +</parameter> +</method> +<method name="setTitle" + return="android.app.DownloadManager.Request" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="title" type="java.lang.CharSequence"> +</parameter> +</method> +<method name="setVisibleInDownloadsUi" + return="android.app.DownloadManager.Request" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="isVisible" type="boolean"> +</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> +</class> <class name="ExpandableListActivity" extends="android.app.Activity" abstract="false" @@ -95347,623 +95964,6 @@ > </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="ACTION_VIEW_DOWNLOADS" - type="java.lang.String" - transient="false" - volatile="false" - value=""android.intent.action.VIEW_DOWNLOADS"" - 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_CANNOT_RESUME" - type="int" - transient="false" - volatile="false" - value="1008" - 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_ALREADY_EXISTS" - type="int" - transient="false" - volatile="false" - value="1009" - 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="addRequestHeader" - 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="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.CharSequence"> -</parameter> -</method> -<method name="setDestinationInExternalFilesDir" - return="android.net.DownloadManager.Request" - abstract="false" - native="false" - synchronized="false" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -<parameter name="context" type="android.content.Context"> -</parameter> -<parameter name="dirType" type="java.lang.String"> -</parameter> -<parameter name="subPath" type="java.lang.String"> -</parameter> -</method> -<method name="setDestinationInExternalPublicDir" - return="android.net.DownloadManager.Request" - abstract="false" - native="false" - synchronized="false" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -<parameter name="dirType" type="java.lang.String"> -</parameter> -<parameter name="subPath" 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="setMimeType" - return="android.net.DownloadManager.Request" - abstract="false" - native="false" - synchronized="false" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -<parameter name="mimeType" type="java.lang.String"> -</parameter> -</method> -<method name="setShowRunningNotification" - return="android.net.DownloadManager.Request" - abstract="false" - native="false" - synchronized="false" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -<parameter name="show" type="boolean"> -</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.CharSequence"> -</parameter> -</method> -<method name="setVisibleInDownloadsUi" - return="android.net.DownloadManager.Request" - abstract="false" - native="false" - synchronized="false" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -<parameter name="isVisible" type="boolean"> -</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> -</class> <class name="LocalServerSocket" extends="java.lang.Object" abstract="false" diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java index 1bbf9ea..c01516f 100644 --- a/core/java/android/app/ContextImpl.java +++ b/core/java/android/app/ContextImpl.java @@ -67,7 +67,6 @@ import android.location.LocationManager; import android.media.AudioManager; import android.net.ConnectivityManager; import android.net.IConnectivityManager; -import android.net.DownloadManager; import android.net.ThrottleManager; import android.net.IThrottleManager; import android.net.Uri; diff --git a/core/java/android/net/DownloadManager.java b/core/java/android/app/DownloadManager.java index 1f220d2..c6fef4f 100644 --- a/core/java/android/net/DownloadManager.java +++ b/core/java/android/app/DownloadManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.net; +package android.app; import android.content.ContentResolver; import android.content.ContentUris; @@ -22,6 +22,8 @@ import android.content.ContentValues; import android.content.Context; import android.database.Cursor; import android.database.CursorWrapper; +import android.net.ConnectivityManager; +import android.net.Uri; import android.os.Environment; import android.os.ParcelFileDescriptor; import android.provider.BaseColumns; diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index 0100550..0dd2e4a 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -1207,7 +1207,7 @@ public abstract class Context { * <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 + * <dd> A {@link android.app.DownloadManager} for requesting HTTP downloads * </dl> * * <p>Note: System services obtained via this API may be closely associated with @@ -1256,7 +1256,7 @@ public abstract class Context { * @see #UI_MODE_SERVICE * @see android.app.UiModeManager * @see #DOWNLOAD_SERVICE - * @see android.net.DownloadManager + * @see android.app.DownloadManager */ public abstract Object getSystemService(String name); @@ -1539,7 +1539,7 @@ public abstract class Context { /** * Use with {@link #getSystemService} to retrieve a - * {@link android.net.DownloadManager} for requesting HTTP downloads. + * {@link android.app.DownloadManager} for requesting HTTP downloads. * * @see #getSystemService */ diff --git a/core/tests/coretests/src/android/net/DownloadManagerBaseTest.java b/core/tests/coretests/src/android/app/DownloadManagerBaseTest.java index a7ec7d5..ed42e64 100644 --- a/core/tests/coretests/src/android/net/DownloadManagerBaseTest.java +++ b/core/tests/coretests/src/android/app/DownloadManagerBaseTest.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package android.net; +package android.app; +import android.app.DownloadManager.Query; +import android.app.DownloadManager.Request; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.database.Cursor; import android.net.ConnectivityManager; -import android.net.DownloadManager; import android.net.NetworkInfo; -import android.net.DownloadManager.Query; -import android.net.DownloadManager.Request; +import android.net.Uri; import android.net.wifi.WifiManager; import android.os.Bundle; import android.os.Environment; diff --git a/core/tests/coretests/src/android/net/DownloadManagerIntegrationTest.java b/core/tests/coretests/src/android/app/DownloadManagerIntegrationTest.java index a61f02d..38f336e 100644 --- a/core/tests/coretests/src/android/net/DownloadManagerIntegrationTest.java +++ b/core/tests/coretests/src/android/app/DownloadManagerIntegrationTest.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package android.net; +package android.app; +import android.app.DownloadManager.Query; +import android.app.DownloadManager.Request; +import android.app.DownloadManagerBaseTest.DataType; +import android.app.DownloadManagerBaseTest.MultipleDownloadsCompletedReceiver; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.database.Cursor; -import android.net.DownloadManager; -import android.net.DownloadManager.Query; -import android.net.DownloadManager.Request; -import android.net.DownloadManagerBaseTest.DataType; -import android.net.DownloadManagerBaseTest.MultipleDownloadsCompletedReceiver; +import android.net.Uri; import android.net.wifi.WifiManager; import android.os.Environment; import android.os.ParcelFileDescriptor; diff --git a/core/tests/coretests/src/android/net/DownloadManagerStressTest.java b/core/tests/coretests/src/android/app/DownloadManagerStressTest.java index 9fa8620..4ff0295 100644 --- a/core/tests/coretests/src/android/net/DownloadManagerStressTest.java +++ b/core/tests/coretests/src/android/app/DownloadManagerStressTest.java @@ -14,14 +14,15 @@ * limitations under the License. */ -package android.net; +package android.app; import java.io.File; import java.util.Random; +import android.app.DownloadManager.Query; +import android.app.DownloadManager.Request; import android.database.Cursor; -import android.net.DownloadManager.Query; -import android.net.DownloadManager.Request; +import android.net.Uri; import android.os.ParcelFileDescriptor; import android.test.suitebuilder.annotation.LargeTest; import android.util.Log; diff --git a/core/tests/hosttests/test-apps/DownloadManagerTestApp/Android.mk b/core/tests/hosttests/test-apps/DownloadManagerTestApp/Android.mk index 576765c..7206f4a 100644 --- a/core/tests/hosttests/test-apps/DownloadManagerTestApp/Android.mk +++ b/core/tests/hosttests/test-apps/DownloadManagerTestApp/Android.mk @@ -19,7 +19,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-java-files-under, src) \ - ../../../coretests/src/android/net/DownloadManagerBaseTest.java + ../../../coretests/src/android/app/DownloadManagerBaseTest.java LOCAL_STATIC_JAVA_LIBRARIES := android-common frameworks-core-util-lib LOCAL_SDK_VERSION := current diff --git a/core/tests/hosttests/test-apps/DownloadManagerTestApp/src/com/android/frameworks/DownloadManagerTestApp.java b/core/tests/hosttests/test-apps/DownloadManagerTestApp/src/com/android/frameworks/DownloadManagerTestApp.java index f21e7ac..c0f670b 100644 --- a/core/tests/hosttests/test-apps/DownloadManagerTestApp/src/com/android/frameworks/DownloadManagerTestApp.java +++ b/core/tests/hosttests/test-apps/DownloadManagerTestApp/src/com/android/frameworks/DownloadManagerTestApp.java @@ -15,13 +15,13 @@ */ package com.android.frameworks.downloadmanagertests; +import android.app.DownloadManager; +import android.app.DownloadManager.Query; +import android.app.DownloadManager.Request; +import android.app.DownloadManagerBaseTest; import android.content.Context; import android.content.Intent; import android.database.Cursor; -import android.net.DownloadManager; -import android.net.DownloadManager.Query; -import android.net.DownloadManager.Request; -import android.net.DownloadManagerBaseTest; import android.net.Uri; import android.os.Environment; import android.os.ParcelFileDescriptor; |