diff options
author | Jeff Sharkey <jsharkey@android.com> | 2012-11-27 18:43:56 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-27 18:43:56 -0800 |
commit | f24b5d91918a292e3ac4ef59b6629f6bc555a42b (patch) | |
tree | 4ea901064f7844594071ff8dcebbd10364881ee0 | |
parent | 06e285daa8df6aef6e30b00ceaebede8e6328c2d (diff) | |
parent | e33e83a5c3cc97ce3b47f1f9b6410c3928f1f7de (diff) | |
download | android_packages_providers_DownloadProvider-f24b5d91918a292e3ac4ef59b6629f6bc555a42b.tar.gz android_packages_providers_DownloadProvider-f24b5d91918a292e3ac4ef59b6629f6bc555a42b.tar.bz2 android_packages_providers_DownloadProvider-f24b5d91918a292e3ac4ef59b6629f6bc555a42b.zip |
am e33e83a5: am 8ec8bdeb: Merge "Update extras for in-progress download." into jb-mr1.1-dev
* commit 'e33e83a5c3cc97ce3b47f1f9b6410c3928f1f7de':
Update extras for in-progress download.
3 files changed, 8 insertions, 9 deletions
diff --git a/src/com/android/providers/downloads/Constants.java b/src/com/android/providers/downloads/Constants.java index 8481435f..8d806182 100644 --- a/src/com/android/providers/downloads/Constants.java +++ b/src/com/android/providers/downloads/Constants.java @@ -75,6 +75,8 @@ public class Constants { /** The default extension for binary files if we can't get one at the HTTP level */ public static final String DEFAULT_DL_BINARY_EXTENSION = ".bin"; + public static final String PROVIDER_PACKAGE_NAME = "com.android.providers.downloads"; + /** * When a number has to be appended to the filename, this string is used to separate the * base filename from the sequence number diff --git a/src/com/android/providers/downloads/DownloadReceiver.java b/src/com/android/providers/downloads/DownloadReceiver.java index cbc963ce..42f029a3 100644 --- a/src/com/android/providers/downloads/DownloadReceiver.java +++ b/src/com/android/providers/downloads/DownloadReceiver.java @@ -94,7 +94,7 @@ public class DownloadReceiver extends BroadcastReceiver { handleNotificationBroadcast(context, intent); } else { sAsyncHandler.post(new Runnable() { - @Override + @Override public void run() { handleNotificationBroadcast(context, intent); result.finish(); diff --git a/ui/src/com/android/providers/downloads/ui/DownloadList.java b/ui/src/com/android/providers/downloads/ui/DownloadList.java index 6ffa0691..ed369932 100644 --- a/ui/src/com/android/providers/downloads/ui/DownloadList.java +++ b/ui/src/com/android/providers/downloads/ui/DownloadList.java @@ -51,6 +51,7 @@ import android.widget.ExpandableListView.OnChildClickListener; import android.widget.ListView; import android.widget.Toast; +import com.android.providers.downloads.Constants; import com.android.providers.downloads.OpenHelper; import java.io.FileNotFoundException; @@ -624,15 +625,11 @@ public class DownloadList extends Activity { .show(); } - /** - * TODO use constants/shared code? - */ private void sendRunningDownloadClickedBroadcast(long id) { - Intent intent = new Intent("android.intent.action.DOWNLOAD_LIST"); - intent.setClassName("com.android.providers.downloads", - "com.android.providers.downloads.DownloadReceiver"); - intent.setData(ContentUris.withAppendedId(Downloads.Impl.ALL_DOWNLOADS_CONTENT_URI, id)); - intent.putExtra("multiple", false); + final Intent intent = new Intent(Constants.ACTION_LIST); + intent.setPackage(Constants.PROVIDER_PACKAGE_NAME); + intent.putExtra(DownloadManager.EXTRA_NOTIFICATION_CLICK_DOWNLOAD_IDS, + new long[] { id }); sendBroadcast(intent); } |