diff options
| author | Kenny Root <kroot@google.com> | 2012-05-07 18:41:27 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-07 18:41:27 -0700 |
| commit | 29bb27ef90564a294d506c2ffd546ba21788aeac (patch) | |
| tree | 8226d74cc09125dd32c5f4110f38460c111e19c0 /core/java/android/app/ApplicationPackageManager.java | |
| parent | d57521c6742f4018761faab1de96bd38afbcac02 (diff) | |
| parent | ceb1b0bfaea56251796b08c07b963de7403d84eb (diff) | |
| download | frameworks_base-29bb27ef90564a294d506c2ffd546ba21788aeac.zip frameworks_base-29bb27ef90564a294d506c2ffd546ba21788aeac.tar.gz frameworks_base-29bb27ef90564a294d506c2ffd546ba21788aeac.tar.bz2 | |
Merge "Add encryption parameters to package installation" into jb-dev
Diffstat (limited to 'core/java/android/app/ApplicationPackageManager.java')
| -rw-r--r-- | core/java/android/app/ApplicationPackageManager.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/app/ApplicationPackageManager.java b/core/java/android/app/ApplicationPackageManager.java index 0510de1..191a696 100644 --- a/core/java/android/app/ApplicationPackageManager.java +++ b/core/java/android/app/ApplicationPackageManager.java @@ -24,6 +24,7 @@ import android.content.IntentSender; import android.content.pm.ActivityInfo; import android.content.pm.ApplicationInfo; import android.content.pm.ComponentInfo; +import android.content.pm.ContainerEncryptionParams; import android.content.pm.FeatureInfo; import android.content.pm.IPackageDataObserver; import android.content.pm.IPackageDeleteObserver; @@ -973,10 +974,10 @@ final class ApplicationPackageManager extends PackageManager { @Override public void installPackageWithVerification(Uri packageURI, IPackageInstallObserver observer, int flags, String installerPackageName, Uri verificationURI, - ManifestDigest manifestDigest) { + ManifestDigest manifestDigest, ContainerEncryptionParams encryptionParams) { try { mPM.installPackageWithVerification(packageURI, observer, flags, installerPackageName, - verificationURI, manifestDigest); + verificationURI, manifestDigest, encryptionParams); } catch (RemoteException e) { // Should never happen! } |