summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRuben Brunk <rubenbrunk@google.com>2012-09-24 14:37:19 -0700
committerRuben Brunk <rubenbrunk@google.com>2012-09-26 18:45:54 -0700
commita2304fb28026f3da1bb91931c4cdd52110c82577 (patch)
treed6b5756855c1b71ebfa9c8c0288b58d12a06bc9e
parent14991c65911034a97268840d36cf9549e06fd56e (diff)
downloadandroid_packages_providers_DownloadProvider-a2304fb28026f3da1bb91931c4cdd52110c82577.tar.gz
android_packages_providers_DownloadProvider-a2304fb28026f3da1bb91931c4cdd52110c82577.tar.bz2
android_packages_providers_DownloadProvider-a2304fb28026f3da1bb91931c4cdd52110c82577.zip
Remove FLAG_ACTIVITY_NEW_TASK from the VIEW intent.
Bug: 7164238 Bug: 7237908 Got rid of FLAG_ACTIVITY_NEW_TASK for proper back behavior Change-Id: I50af9aeafb27d6079bda4f81f4a116b6bb600676
-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 0151c8de..6424bcde 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