From 31fd85f39b554e09b2e6c1c2ccf5c186859880fa Mon Sep 17 00:00:00 2001 From: Steve Howard Date: Mon, 27 Sep 2010 16:32:39 -0700 Subject: [PATCH] Move DownloadManager to android.app (DO NOT MERGE) Changing package at hackbod's request. I'll merge this manually, as there's some additional master-only code that will be to be simultaneously changed. Change-Id: Ibb629ec1c31807fbee31e0193c6a941d04be0117 --- api/current.xml | 1234 ++++++++--------- core/java/android/app/ContextImpl.java | 1 - .../android/{net => app}/DownloadManager.java | 4 +- core/java/android/content/Context.java | 6 +- .../{net => app}/DownloadManagerBaseTest.java | 8 +- .../DownloadManagerIntegrationTest.java | 12 +- .../DownloadManagerStressTest.java | 7 +- .../DownloadManagerTestApp/Android.mk | 2 +- .../frameworks/DownloadManagerTestApp.java | 8 +- 9 files changed, 642 insertions(+), 640 deletions(-) rename core/java/android/{net => app}/DownloadManager.java (99%) rename core/tests/coretests/src/android/{net => app}/DownloadManagerBaseTest.java (99%) rename core/tests/coretests/src/android/{net => app}/DownloadManagerIntegrationTest.java (98%) rename core/tests/coretests/src/android/{net => app}/DownloadManagerStressTest.java (97%) diff --git a/api/current.xml b/api/current.xml index 876fe00ab525c..179c515f6b24c 100644 --- a/api/current.xml +++ b/api/current.xml @@ -24488,6 +24488,623 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {@link #UI_MODE_SERVICE} ("uimode") *
An {@link android.app.UiModeManager} for controlling UI modes. *
{@link #DOWNLOAD_SERVICE} ("download") - *
A {@link android.net.DownloadManager} for requesting HTTP downloads + *
A {@link android.app.DownloadManager} for requesting HTTP downloads * * *

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 similarity index 99% rename from core/tests/coretests/src/android/net/DownloadManagerBaseTest.java rename to core/tests/coretests/src/android/app/DownloadManagerBaseTest.java index a7ec7d5fd5232..ed42e64136635 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 similarity index 98% rename from core/tests/coretests/src/android/net/DownloadManagerIntegrationTest.java rename to core/tests/coretests/src/android/app/DownloadManagerIntegrationTest.java index a61f02d637dfd..38f336e35c8a5 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 similarity index 97% rename from core/tests/coretests/src/android/net/DownloadManagerStressTest.java rename to core/tests/coretests/src/android/app/DownloadManagerStressTest.java index 9fa8620b0931f..4ff02953f1857 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 576765c742b04..7206f4ade0b33 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 f21e7ac26c058..c0f670b563d2d 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;