diff options
| author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-07-25 00:32:47 +0100 |
|---|---|---|
| committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-07-25 00:32:47 +0100 |
| commit | f587ad6fd760c78eae8fe7a59104f43a7ea84f3d (patch) | |
| tree | 1c8f9d691d69b893902c7c2d467a3df0555b2615 /src/com/android/packageinstaller/InstallAppProgress.java | |
| parent | a4b300d057b74e848de622c33c2206281d0df631 (diff) | |
| parent | b1a5960af6814e38ae7dcd771d25c1d8ab1dcae6 (diff) | |
| download | android_packages_apps_PackageInstaller-f587ad6fd760c78eae8fe7a59104f43a7ea84f3d.tar.gz android_packages_apps_PackageInstaller-f587ad6fd760c78eae8fe7a59104f43a7ea84f3d.tar.bz2 android_packages_apps_PackageInstaller-f587ad6fd760c78eae8fe7a59104f43a7ea84f3d.zip | |
Merge tag 'android-4.3_r2.1' into cm-10.2
Android 4.3 release 2.1
Conflicts:
res/values-nl/strings.xml
Change-Id: I6b4a88abd08a4a2f2cecbc4ea5b86bbc736d2dd6
Diffstat (limited to 'src/com/android/packageinstaller/InstallAppProgress.java')
| -rwxr-xr-x | src/com/android/packageinstaller/InstallAppProgress.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/packageinstaller/InstallAppProgress.java b/src/com/android/packageinstaller/InstallAppProgress.java index fc820782..71c792ee 100755 --- a/src/com/android/packageinstaller/InstallAppProgress.java +++ b/src/com/android/packageinstaller/InstallAppProgress.java @@ -24,6 +24,7 @@ import android.content.DialogInterface.OnCancelListener; import android.content.Intent; import android.content.pm.ApplicationInfo; import android.content.pm.IPackageInstallObserver; +import android.content.pm.ManifestDigest; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; @@ -54,6 +55,8 @@ import java.util.List; public class InstallAppProgress extends Activity implements View.OnClickListener, OnCancelListener { private final String TAG="InstallAppProgress"; private boolean localLOGV = false; + static final String EXTRA_MANIFEST_DIGEST = + "com.android.packageinstaller.extras.manifest_digest"; private ApplicationInfo mAppInfo; private Uri mPackageURI; private ProgressBar mProgressBar; @@ -254,8 +257,9 @@ public class InstallAppProgress extends Activity implements View.OnClickListener Uri referrer = getIntent().getParcelableExtra(Intent.EXTRA_REFERRER); int originatingUid = getIntent().getIntExtra(Intent.EXTRA_ORIGINATING_UID, VerificationParams.NO_UID); + ManifestDigest manifestDigest = getIntent().getParcelableExtra(EXTRA_MANIFEST_DIGEST); VerificationParams verificationParams = new VerificationParams(null, originatingURI, - referrer, originatingUid, null); + referrer, originatingUid, manifestDigest); PackageInstallObserver observer = new PackageInstallObserver(); if ("package".equals(mPackageURI.getScheme())) { |