diff options
author | Steve Howard <showard@google.com> | 2010-09-28 12:41:36 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-28 12:41:36 -0700 |
commit | ee215b3df5482b9051364d99411f70132734be21 (patch) | |
tree | 1997b5d7cef1dfe412483a966cbbe7ebd6a33ef7 /src | |
parent | b281b2e6590941e53b0ef3d644e08c48d3367de3 (diff) | |
parent | 14961f94d762e733a733e3268fca1074d8da5f8c (diff) | |
download | android_packages_providers_DownloadProvider-ee215b3df5482b9051364d99411f70132734be21.tar.gz android_packages_providers_DownloadProvider-ee215b3df5482b9051364d99411f70132734be21.tar.bz2 android_packages_providers_DownloadProvider-ee215b3df5482b9051364d99411f70132734be21.zip |
am 14961f94: Moved DownloadManager to android.app (DO NOT MERGE)
Merge commit '14961f94d762e733a733e3268fca1074d8da5f8c' into gingerbread-plus-aosp
* commit '14961f94d762e733a733e3268fca1074d8da5f8c':
Moved DownloadManager to android.app (DO NOT MERGE)
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/providers/downloads/DownloadInfo.java | 2 | ||||
-rw-r--r-- | src/com/android/providers/downloads/DownloadReceiver.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/providers/downloads/DownloadInfo.java b/src/com/android/providers/downloads/DownloadInfo.java index 2196cfc6..a2048958 100644 --- a/src/com/android/providers/downloads/DownloadInfo.java +++ b/src/com/android/providers/downloads/DownloadInfo.java @@ -16,6 +16,7 @@ package com.android.providers.downloads; +import android.app.DownloadManager; import android.content.ContentResolver; import android.content.ContentUris; import android.content.ContentValues; @@ -25,7 +26,6 @@ import android.database.CharArrayBuffer; import android.database.Cursor; import android.drm.mobile1.DrmRawContent; import android.net.ConnectivityManager; -import android.net.DownloadManager; import android.net.Uri; import android.provider.Downloads; import android.provider.Downloads.Impl; diff --git a/src/com/android/providers/downloads/DownloadReceiver.java b/src/com/android/providers/downloads/DownloadReceiver.java index d81e0266..c41895b9 100644 --- a/src/com/android/providers/downloads/DownloadReceiver.java +++ b/src/com/android/providers/downloads/DownloadReceiver.java @@ -16,6 +16,7 @@ package com.android.providers.downloads; +import android.app.DownloadManager; import android.content.ActivityNotFoundException; import android.content.BroadcastReceiver; import android.content.ContentUris; @@ -24,7 +25,6 @@ import android.content.Context; import android.content.Intent; import android.database.Cursor; import android.net.ConnectivityManager; -import android.net.DownloadManager; import android.net.NetworkInfo; import android.net.Uri; import android.provider.Downloads; |