summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRuben Brunk <rubenbrunk@google.com>2012-09-28 11:28:23 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-09-28 11:28:24 -0700
commitf161f8b6ab4ddf3dbedd1731771b1eacc628c48c (patch)
tree8b71c84f938bf78693fcc97d9e31f411eb75b3c1 /src
parent46bb7dd18c9b092d352d76ab44a4e52951941b2c (diff)
parenta2304fb28026f3da1bb91931c4cdd52110c82577 (diff)
downloadandroid_packages_providers_DownloadProvider-f161f8b6ab4ddf3dbedd1731771b1eacc628c48c.tar.gz
android_packages_providers_DownloadProvider-f161f8b6ab4ddf3dbedd1731771b1eacc628c48c.tar.bz2
android_packages_providers_DownloadProvider-f161f8b6ab4ddf3dbedd1731771b1eacc628c48c.zip
Merge "Remove FLAG_ACTIVITY_NEW_TASK from the VIEW intent." into jb-mr1-dev
Diffstat (limited to 'src')
-rw-r--r--src/com/android/providers/downloads/DownloadReceiver.java1
-rw-r--r--src/com/android/providers/downloads/OpenHelper.java2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/providers/downloads/DownloadReceiver.java b/src/com/android/providers/downloads/DownloadReceiver.java
index aa165e41..7469508d 100644
--- a/src/com/android/providers/downloads/DownloadReceiver.java
+++ b/src/com/android/providers/downloads/DownloadReceiver.java
@@ -145,6 +145,7 @@ public class DownloadReceiver extends BroadcastReceiver {
private void openDownload(Context context, Cursor cursor) {
final long id = cursor.getLong(cursor.getColumnIndexOrThrow(BaseColumns._ID));
final Intent intent = OpenHelper.buildViewIntent(context, id);
+ intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
try {
context.startActivity(intent);
} catch (ActivityNotFoundException ex) {
diff --git a/src/com/android/providers/downloads/OpenHelper.java b/src/com/android/providers/downloads/OpenHelper.java
index c7d90edd..356375b8 100644
--- a/src/com/android/providers/downloads/OpenHelper.java
+++ b/src/com/android/providers/downloads/OpenHelper.java
@@ -49,7 +49,7 @@ public class OpenHelper {
final String mimeType = getCursorString(cursor, COLUMN_MEDIA_TYPE);
final Intent intent = new Intent(Intent.ACTION_VIEW);
- intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_GRANT_READ_URI_PERMISSION);
+ intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
if ("application/vnd.android.package-archive".equals(mimeType)) {
// PackageInstaller doesn't like content URIs, so open file