diff options
author | Jeff Sharkey <jsharkey@android.com> | 2013-08-19 14:47:58 -0700 |
---|---|---|
committer | Jeff Sharkey <jsharkey@android.com> | 2013-08-19 14:48:14 -0700 |
commit | 90aacc868d1a20e477f934a5bfdb10bb29846d93 (patch) | |
tree | 195aa8813494ea4d50a9531e516a31ae8133b398 /src | |
parent | ed08089f6dccae69eabfaa3383c5007f0dddc6a5 (diff) | |
download | android_packages_providers_DownloadProvider-90aacc868d1a20e477f934a5bfdb10bb29846d93.tar.gz android_packages_providers_DownloadProvider-90aacc868d1a20e477f934a5bfdb10bb29846d93.tar.bz2 android_packages_providers_DownloadProvider-90aacc868d1a20e477f934a5bfdb10bb29846d93.zip |
Trampoline APK installation to use raw file.
PackageInstaller requires raw file:// Uris, and refuses to accept
content:// Uris, so create a trampoline that uses the raw file and
also splices in referrer extras.
Bug: 10391254
Change-Id: I12a06862069479de5dee140d0065479ce79eb494
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/providers/downloads/DownloadStorageProvider.java | 2 | ||||
-rw-r--r-- | src/com/android/providers/downloads/TrampolineActivity.java | 41 |
2 files changed, 42 insertions, 1 deletions
diff --git a/src/com/android/providers/downloads/DownloadStorageProvider.java b/src/com/android/providers/downloads/DownloadStorageProvider.java index f66f5260..b606e652 100644 --- a/src/com/android/providers/downloads/DownloadStorageProvider.java +++ b/src/com/android/providers/downloads/DownloadStorageProvider.java @@ -260,7 +260,7 @@ public class DownloadStorageProvider extends ContentProvider { } } - private long getDownloadFromDocument(String docId) { + public static long getDownloadFromDocument(String docId) { return Long.parseLong(docId.substring(docId.indexOf(':') + 1)); } diff --git a/src/com/android/providers/downloads/TrampolineActivity.java b/src/com/android/providers/downloads/TrampolineActivity.java new file mode 100644 index 00000000..a1e99161 --- /dev/null +++ b/src/com/android/providers/downloads/TrampolineActivity.java @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2013 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.providers.downloads; + +import android.app.Activity; +import android.content.Intent; +import android.net.Uri; +import android.os.Bundle; +import android.provider.DocumentsContract; + +/** + * PackageInstaller really wants raw files. + */ +public class TrampolineActivity extends Activity { + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + final Uri documentUri = getIntent().getData(); + final String docId = DocumentsContract.getDocId(documentUri); + final long downloadId = DownloadStorageProvider.getDownloadFromDocument(docId); + + final Intent intent = OpenHelper.buildViewIntent(this, downloadId); + startActivity(intent); + finish(); + } +} |