Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Move DownloadManager to android.app (DO NOT MERGE)" into gingerbread

Browse Source
This commit is contained in:
Steve Howard
2010-09-28 12:38:15 -07:00
committed by Android (Google) Code Review
parent be04506195 31fd85f39b
commit 5bdb89d7ac
9 changed files with 642 additions and 640 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1234
api/current.xml
View File

File diff suppressed because it is too large Load Diff

1
core/java/android/app/ContextImpl.java
View File

@@ -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;

4
core/java/android/net/DownloadManager.java → core/java/android/app/DownloadManager.java
View File

@@ -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;

6
core/java/android/content/Context.java
View File

@@ -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
*/

8
core/tests/coretests/src/android/net/DownloadManagerBaseTest.java → core/tests/coretests/src/android/app/DownloadManagerBaseTest.java
View File

@@ -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;

12
core/tests/coretests/src/android/net/DownloadManagerIntegrationTest.java → core/tests/coretests/src/android/app/DownloadManagerIntegrationTest.java
View File

@@ -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;

7
core/tests/coretests/src/android/net/DownloadManagerStressTest.java → core/tests/coretests/src/android/app/DownloadManagerStressTest.java
View File

@@ -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;

2
core/tests/hosttests/test-apps/DownloadManagerTestApp/Android.mk
View File

@@ -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

8
core/tests/hosttests/test-apps/DownloadManagerTestApp/src/com/android/frameworks/DownloadManagerTestApp.java
View File

@@ -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;