summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRich Cannings <richc@google.com>2012-08-08 12:45:59 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-08-08 12:45:59 -0700
commit319efc1c099a0c0c516d3a0d3d110c8608c9eee9 (patch)
treec958ca52355c5390f6a3f1914a396c365330b308
parent076ca8c8373a3d5f3f56103fa85966cc6c34c94a (diff)
downloadandroid_packages_apps_PackageInstaller-319efc1c099a0c0c516d3a0d3d110c8608c9eee9.zip
android_packages_apps_PackageInstaller-319efc1c099a0c0c516d3a0d3d110c8608c9eee9.tar.gz
android_packages_apps_PackageInstaller-319efc1c099a0c0c516d3a0d3d110c8608c9eee9.tar.bz2
Revert "Accept and pass URLs to PackageManagerService"
This reverts commit 076ca8c8373a3d5f3f56103fa85966cc6c34c94a Change-Id: I955510c4aa9f7fada2685ca274d0bb8fbdd91cdf
-rwxr-xr-xsrc/com/android/packageinstaller/InstallAppProgress.java7
-rw-r--r--src/com/android/packageinstaller/PackageInstallerActivity.java12
2 files changed, 2 insertions, 17 deletions
diff --git a/src/com/android/packageinstaller/InstallAppProgress.java b/src/com/android/packageinstaller/InstallAppProgress.java
index 6e471cb..8bfcd4f 100755
--- a/src/com/android/packageinstaller/InstallAppProgress.java
+++ b/src/com/android/packageinstaller/InstallAppProgress.java
@@ -243,13 +243,8 @@ public class InstallAppProgress extends Activity implements View.OnClickListener
String installerPackageName = getIntent().getStringExtra(
Intent.EXTRA_INSTALLER_PACKAGE_NAME);
- Uri originatingURI = getIntent().getParcelableExtra(Intent.EXTRA_ORIGINATING_URI);
- Uri referrer = getIntent().getParcelableExtra(Intent.EXTRA_REFERRER);
-
PackageInstallObserver observer = new PackageInstallObserver();
-
- pm.installPackageWithOrigin(mPackageURI, observer, installFlags,
- installerPackageName, originatingURI, referrer);
+ pm.installPackage(mPackageURI, observer, installFlags, installerPackageName);
}
@Override
diff --git a/src/com/android/packageinstaller/PackageInstallerActivity.java b/src/com/android/packageinstaller/PackageInstallerActivity.java
index d76295a..9963103 100644
--- a/src/com/android/packageinstaller/PackageInstallerActivity.java
+++ b/src/com/android/packageinstaller/PackageInstallerActivity.java
@@ -60,9 +60,7 @@ import java.util.ArrayList;
*/
public class PackageInstallerActivity extends Activity implements OnCancelListener, OnClickListener {
private static final String TAG = "PackageInstaller";
- private Uri mPackageURI;
- private Uri mPackageOriginatingURI;
- private Uri mPackageReferrer;
+ private Uri mPackageURI;
private boolean localLOGV = false;
PackageManager mPm;
PackageParser.Package mPkgInfo;
@@ -286,8 +284,6 @@ public class PackageInstallerActivity extends Activity implements OnCancelListen
// get intent information
final Intent intent = getIntent();
mPackageURI = intent.getData();
- mPackageOriginatingURI = intent.getParcelableExtra(Intent.EXTRA_ORIGINATING_URI);
- mPackageReferrer = intent.getParcelableExtra(Intent.EXTRA_REFERRER);
mPm = getPackageManager();
final String scheme = mPackageURI.getScheme();
@@ -368,12 +364,6 @@ public class PackageInstallerActivity extends Activity implements OnCancelListen
newIntent.setData(mPackageURI);
newIntent.setClass(this, InstallAppProgress.class);
String installerPackageName = getIntent().getStringExtra(Intent.EXTRA_INSTALLER_PACKAGE_NAME);
- if (mPackageOriginatingURI != null) {
- newIntent.putExtra(Intent.EXTRA_ORIGINATING_URI, mPackageOriginatingURI);
- }
- if (mPackageReferrer != null) {
- newIntent.putExtra(Intent.EXTRA_REFERRER, mPackageReferrer);
- }
if (installerPackageName != null) {
newIntent.putExtra(Intent.EXTRA_INSTALLER_PACKAGE_NAME, installerPackageName);
}