summaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2012-08-27 21:53:30 -0700
committerJeff Sharkey <jsharkey@android.com>2012-08-27 21:55:06 -0700
commitc0622bf896c1af62b0e69b18cd84c7de3b67beb3 (patch)
treed5cbc3624eb9db219d38cebe0ef9f9951884641a /ui
parent5cae217e7c6c8b043eada8041b224e713104f141 (diff)
downloadandroid_packages_providers_DownloadProvider-c0622bf896c1af62b0e69b18cd84c7de3b67beb3.tar.gz
android_packages_providers_DownloadProvider-c0622bf896c1af62b0e69b18cd84c7de3b67beb3.tar.bz2
android_packages_providers_DownloadProvider-c0622bf896c1af62b0e69b18cd84c7de3b67beb3.zip
Send ORIGINATING_URI and REFERRER to installer.
When building PackageInstaller intents, include ORIGINATING_URI and REFERRER extras. Unify view intent building for both notifications and list UI. Bug: 6900672 Change-Id: I18435e0f8aa549880ec594f82b6a250232706135
Diffstat (limited to 'ui')
-rw-r--r--ui/Android.mk5
-rw-r--r--ui/src/com/android/providers/downloads/ui/DownloadList.java20
2 files changed, 9 insertions, 16 deletions
diff --git a/ui/Android.mk b/ui/Android.mk
index 8c925f64..14211ea2 100644
--- a/ui/Android.mk
+++ b/ui/Android.mk
@@ -3,7 +3,10 @@ include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_SRC_FILES := $(call all-java-files-under, src) \
+ ../src/com/android/providers/downloads/OpenHelper.java \
+ ../src/com/android/providers/downloads/Constants.java \
+ ../src/com/android/providers/downloads/DownloadDrmHelper.java
LOCAL_PACKAGE_NAME := DownloadProviderUi
LOCAL_CERTIFICATE := media
diff --git a/ui/src/com/android/providers/downloads/ui/DownloadList.java b/ui/src/com/android/providers/downloads/ui/DownloadList.java
index 103d3f83..6ffa0691 100644
--- a/ui/src/com/android/providers/downloads/ui/DownloadList.java
+++ b/ui/src/com/android/providers/downloads/ui/DownloadList.java
@@ -32,6 +32,7 @@ import android.os.Bundle;
import android.os.Environment;
import android.os.Handler;
import android.os.Parcelable;
+import android.provider.BaseColumns;
import android.provider.Downloads;
import android.util.Log;
import android.util.SparseBooleanArray;
@@ -50,6 +51,8 @@ import android.widget.ExpandableListView.OnChildClickListener;
import android.widget.ListView;
import android.widget.Toast;
+import com.android.providers.downloads.OpenHelper;
+
import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.ArrayList;
@@ -499,7 +502,6 @@ public class DownloadList extends Activity {
* Send an Intent to open the download currently pointed to by the given cursor.
*/
private void openCurrentDownload(Cursor cursor) {
- final long id = cursor.getInt(mIdColumnId);
final Uri localUri = Uri.parse(cursor.getString(mLocalUriColumnId));
try {
getContentResolver().openFileDescriptor(localUri, "r").close();
@@ -512,20 +514,8 @@ public class DownloadList extends Activity {
// close() failed, not a problem
}
- final Uri viewUri;
- final String mimeType = cursor.getString(mMediaTypeColumnId);
- if ("application/vnd.android.package-archive".equals(mimeType)) {
- // PackageInstaller doesn't like content URIs, so open file
- viewUri = localUri;
- } else if ("file".equals(localUri.getScheme())) {
- viewUri = ContentUris.withAppendedId(Downloads.Impl.ALL_DOWNLOADS_CONTENT_URI, id);
- } else {
- viewUri = localUri;
- }
-
- Intent intent = new Intent(Intent.ACTION_VIEW);
- intent.setDataAndType(viewUri, mimeType);
- intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_GRANT_READ_URI_PERMISSION);
+ final long id = cursor.getLong(cursor.getColumnIndexOrThrow(BaseColumns._ID));
+ final Intent intent = OpenHelper.buildViewIntent(this, id);
try {
startActivity(intent);
} catch (ActivityNotFoundException ex) {