From 916ad007619e025218665298ef9793c152ced070 Mon Sep 17 00:00:00 2001 From: rich cannings Date: Mon, 20 Aug 2012 15:02:01 -0700 Subject: Accept and pass URLs to PackageManagerService This change passes the originating URI and referrer of an apk, when available, to the package manager. Bug: 6544677 Change-Id: I1431b0e02eb779d9699e282ae59aaab485a00626 --- src/com/android/packageinstaller/InstallAppProgress.java | 9 ++++++++- src/com/android/packageinstaller/PackageInstallerActivity.java | 10 ++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) (limited to 'src/com/android') diff --git a/src/com/android/packageinstaller/InstallAppProgress.java b/src/com/android/packageinstaller/InstallAppProgress.java index 8bfcd4f1..a2feacf2 100755 --- a/src/com/android/packageinstaller/InstallAppProgress.java +++ b/src/com/android/packageinstaller/InstallAppProgress.java @@ -28,6 +28,7 @@ import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.ResolveInfo; +import android.content.pm.VerificationParams; import android.graphics.drawable.LevelListDrawable; import android.net.Uri; import android.os.Bundle; @@ -243,8 +244,14 @@ 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); + VerificationParams verificationParams = new VerificationParams(null, originatingURI, + referrer, null); PackageInstallObserver observer = new PackageInstallObserver(); - pm.installPackage(mPackageURI, observer, installFlags, installerPackageName); + + pm.installPackageWithVerificationAndEncryption(mPackageURI, observer, installFlags, + installerPackageName, verificationParams, null); } @Override diff --git a/src/com/android/packageinstaller/PackageInstallerActivity.java b/src/com/android/packageinstaller/PackageInstallerActivity.java index 99631035..60697485 100644 --- a/src/com/android/packageinstaller/PackageInstallerActivity.java +++ b/src/com/android/packageinstaller/PackageInstallerActivity.java @@ -61,6 +61,8 @@ import java.util.ArrayList; public class PackageInstallerActivity extends Activity implements OnCancelListener, OnClickListener { private static final String TAG = "PackageInstaller"; private Uri mPackageURI; + private Uri mOriginatingURI; + private Uri mReferrerURI; private boolean localLOGV = false; PackageManager mPm; PackageParser.Package mPkgInfo; @@ -284,6 +286,8 @@ public class PackageInstallerActivity extends Activity implements OnCancelListen // get intent information final Intent intent = getIntent(); mPackageURI = intent.getData(); + mOriginatingURI = intent.getParcelableExtra(Intent.EXTRA_ORIGINATING_URI); + mReferrerURI = intent.getParcelableExtra(Intent.EXTRA_REFERRER); mPm = getPackageManager(); final String scheme = mPackageURI.getScheme(); @@ -364,6 +368,12 @@ 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 (mOriginatingURI != null) { + newIntent.putExtra(Intent.EXTRA_ORIGINATING_URI, mOriginatingURI); + } + if (mReferrerURI != null) { + newIntent.putExtra(Intent.EXTRA_REFERRER, mReferrerURI); + } if (installerPackageName != null) { newIntent.putExtra(Intent.EXTRA_INSTALLER_PACKAGE_NAME, installerPackageName); } -- cgit v1.2.3