From b413366d106fa52ec6cea9a3a1d2c0cf1df3f95b Mon Sep 17 00:00:00 2001 From: Rich Cannings Date: Wed, 8 Aug 2012 12:45:59 -0700 Subject: Revert "Accept and pass URLs to PackageManagerService" This reverts commit 076ca8c8373a3d5f3f56103fa85966cc6c34c94a Change-Id: I955510c4aa9f7fada2685ca274d0bb8fbdd91cdf --- src/com/android/packageinstaller/InstallAppProgress.java | 7 +------ .../android/packageinstaller/PackageInstallerActivity.java | 12 +----------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/src/com/android/packageinstaller/InstallAppProgress.java b/src/com/android/packageinstaller/InstallAppProgress.java index 6e471cb2..8bfcd4f1 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 d76295ac..99631035 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); } -- cgit v1.2.3