diff options
author | Ruben Brunk <rubenbrunk@google.com> | 2012-09-28 11:30:21 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-28 11:30:21 -0700 |
commit | 28b8c3d8fba3e3d304c763851083a99a22468eee (patch) | |
tree | a2e11f33d7b88eb7c301dfc91435676e022a7bb0 | |
parent | 565918c034a53323871617df38f796036c1105b3 (diff) | |
parent | f161f8b6ab4ddf3dbedd1731771b1eacc628c48c (diff) | |
download | android_packages_providers_DownloadProvider-28b8c3d8fba3e3d304c763851083a99a22468eee.tar.gz android_packages_providers_DownloadProvider-28b8c3d8fba3e3d304c763851083a99a22468eee.tar.bz2 android_packages_providers_DownloadProvider-28b8c3d8fba3e3d304c763851083a99a22468eee.zip |
am f161f8b6: Merge "Remove FLAG_ACTIVITY_NEW_TASK from the VIEW intent." into jb-mr1-dev
* commit 'f161f8b6ab4ddf3dbedd1731771b1eacc628c48c':
Remove FLAG_ACTIVITY_NEW_TASK from the VIEW intent.
-rw-r--r-- | src/com/android/providers/downloads/DownloadReceiver.java | 1 | ||||
-rw-r--r-- | src/com/android/providers/downloads/OpenHelper.java | 2 |
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 |