drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Pass URLs to package verifiers"

Browse Source 
This reverts commit 24713907fe

Change-Id: Ie04ba73475b813635c4a74915c45e83250801b6b
This commit is contained in:
Rich Cannings
2012-08-08 12:46:06 -07:00
committed by Android (Google) Code Review
parent 24713907fe
commit e1d7c711df
8 changed files with 21 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
services/java/com/android/server/pm/PackageManagerService.java
View File

@ -5335,21 +5335,13 @@ public class PackageManagerService extends IPackageManager.Stub {
final Uri packageURI, final IPackageInstallObserver observer, final int flags,
final String installerPackageName) {
installPackageWithVerification(packageURI, observer, flags, installerPackageName, null,
null, null, null, null);
}
public void installPackageWithOrigin(
Uri packageURI, IPackageInstallObserver observer, int flags,
String installerPackageName, Uri originatingURI, Uri referrer) {
installPackageWithVerification(packageURI, observer, flags, installerPackageName, null,
null, null, originatingURI, referrer);
null, null);
}
@Override
public void installPackageWithVerification(Uri packageURI, IPackageInstallObserver observer,
int flags, String installerPackageName, Uri verificationURI,
ManifestDigest manifestDigest, ContainerEncryptionParams encryptionParams,
Uri originatingURI, Uri referrer) {
ManifestDigest manifestDigest, ContainerEncryptionParams encryptionParams) {
mContext.enforceCallingOrSelfPermission(android.Manifest.permission.INSTALL_PACKAGES, null);
final int uid = Binder.getCallingUid();
@ -5367,7 +5359,7 @@ public class PackageManagerService extends IPackageManager.Stub {
final Message msg = mHandler.obtainMessage(INIT_COPY);
msg.obj = new InstallParams(packageURI, observer, filteredFlags, installerPackageName,
verificationURI, manifestDigest, encryptionParams, originatingURI, referrer);
verificationURI, manifestDigest, encryptionParams);
mHandler.sendMessage(msg);
}
@ -5803,13 +5795,11 @@ public class PackageManagerService extends IPackageManager.Stub {
private int mRet;
private File mTempPackage;
final ContainerEncryptionParams encryptionParams;
final Uri originatingURI;
final Uri referrer;
InstallParams(Uri packageURI,
IPackageInstallObserver observer, int flags,
String installerPackageName, Uri verificationURI, ManifestDigest manifestDigest,
ContainerEncryptionParams encryptionParams, Uri originatingURI, Uri referrer) {
ContainerEncryptionParams encryptionParams) {
this.mPackageURI = packageURI;
this.flags = flags;
this.observer = observer;
@ -5817,8 +5807,6 @@ public class PackageManagerService extends IPackageManager.Stub {
this.verificationURI = verificationURI;
this.manifestDigest = manifestDigest;
this.encryptionParams = encryptionParams;
this.originatingURI = originatingURI;
this.referrer = referrer;
}
private int installLocationPolicy(PackageInfoLite pkgLite, int flags) {
@ -6014,14 +6002,6 @@ public class PackageManagerService extends IPackageManager.Stub {
verificationURI);
}
if (originatingURI != null) {
verification.putExtra(Intent.EXTRA_ORIGINATING_URI, originatingURI);
}
if (referrer != null) {
verification.putExtra(Intent.EXTRA_REFERRER, referrer);
}
final PackageVerificationState verificationState = new PackageVerificationState(
requiredUid, args);