diff options
| author | Ben Gruver <bgruv@google.com> | 2012-09-28 10:58:18 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-28 10:58:19 -0700 |
| commit | 9dbbfcda81f251f23aded866f7f9d49d8a744c75 (patch) | |
| tree | d76ac568a3da95b39987c611aaa4d27ba26c7465 /services/java/com/android/server/pm | |
| parent | f80ad90f0b269e31d9450b9fa33f4dc3e4a507c7 (diff) | |
| parent | 37d83a3caf138e35fa1a355787d20c351f6b37a6 (diff) | |
| download | frameworks_base-9dbbfcda81f251f23aded866f7f9d49d8a744c75.zip frameworks_base-9dbbfcda81f251f23aded866f7f9d49d8a744c75.tar.gz frameworks_base-9dbbfcda81f251f23aded866f7f9d49d8a744c75.tar.bz2 | |
Merge "Pass the originating uid to the package verifier" into jb-mr1-dev
Diffstat (limited to 'services/java/com/android/server/pm')
| -rw-r--r-- | services/java/com/android/server/pm/PackageManagerService.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/services/java/com/android/server/pm/PackageManagerService.java b/services/java/com/android/server/pm/PackageManagerService.java index 6accb39..1eafd9c 100644 --- a/services/java/com/android/server/pm/PackageManagerService.java +++ b/services/java/com/android/server/pm/PackageManagerService.java @@ -5614,7 +5614,7 @@ public class PackageManagerService extends IPackageManager.Stub { int flags, String installerPackageName, Uri verificationURI, ManifestDigest manifestDigest, ContainerEncryptionParams encryptionParams) { VerificationParams verificationParams = new VerificationParams(verificationURI, null, null, - manifestDigest); + VerificationParams.NO_UID, manifestDigest); installPackageWithVerificationAndEncryption(packageURI, observer, flags, installerPackageName, verificationParams, encryptionParams); } @@ -6438,6 +6438,10 @@ public class PackageManagerService extends IPackageManager.Stub { verification.putExtra(Intent.EXTRA_REFERRER, verificationParams.getReferrer()); } + if (verificationParams.getOriginatingUid() >= 0) { + verification.putExtra(Intent.EXTRA_ORIGINATING_UID, + verificationParams.getOriginatingUid()); + } if (verificationParams.getInstallerUid() >= 0) { verification.putExtra(PackageManager.EXTRA_VERIFICATION_INSTALLER_UID, verificationParams.getInstallerUid()); |