Merge "Update extras for in-progress download." into jb-mr1.1-dev

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

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();

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);
     }