Merge "No need to pass digest of AndroidManifest.xml around."

3 files changed, 1 insertions, 9 deletions

diff --git a/src/com/android/packageinstaller/InstallAppProgress.java b/src/com/android/packageinstaller/InstallAppProgress.java
index 9cb1c2c9..d40d84d9 100755
--- a/src/com/android/packageinstaller/InstallAppProgress.java
+++ b/src/com/android/packageinstaller/InstallAppProgress.java
@@ -66,8 +66,6 @@ import java.util.List;
  */
 public class InstallAppProgress extends Activity implements View.OnClickListener, OnCancelListener {
     private final String TAG="InstallAppProgress";
-    static final String EXTRA_MANIFEST_DIGEST =
-            "com.android.packageinstaller.extras.manifest_digest";
     private static final String BROADCAST_ACTION =
             "com.android.packageinstaller.ACTION_INSTALL_COMMIT";
     private static final String BROADCAST_SENDER_PERMISSION =
diff --git a/src/com/android/packageinstaller/PackageInstallerActivity.java b/src/com/android/packageinstaller/PackageInstallerActivity.java
index 0759ecec..0385ecdf 100644
--- a/src/com/android/packageinstaller/PackageInstallerActivity.java
+++ b/src/com/android/packageinstaller/PackageInstallerActivity.java
@@ -26,7 +26,6 @@ import android.content.DialogInterface.OnCancelListener;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.ApplicationInfo;
-import android.content.pm.ManifestDigest;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageInstaller;
 import android.content.pm.PackageManager;
@@ -70,7 +69,6 @@ public class PackageInstallerActivity extends Activity implements OnCancelListen
     private Uri mOriginatingURI;
     private Uri mReferrerURI;
     private int mOriginatingUid = VerificationParams.NO_UID;
-    private ManifestDigest mPkgDigest;
 
     private boolean localLOGV = false;
     PackageManager mPm;
@@ -487,7 +485,6 @@ public class PackageInstallerActivity extends Activity implements OnCancelListen
             mPkgInfo = PackageParser.generatePackageInfo(parsed, null,
                     PackageManager.GET_PERMISSIONS, 0, 0, null,
                     new PackageUserState());
-            mPkgDigest = parsed.manifestDigest;
             as = PackageUtil.getAppSnippet(this, mPkgInfo.applicationInfo, sourceFile);
         }
 
@@ -634,7 +631,6 @@ public class PackageInstallerActivity extends Activity implements OnCancelListen
                 mPkgInfo.applicationInfo);
         newIntent.setData(mPackageURI);
         newIntent.setClass(this, InstallAppProgress.class);
-        newIntent.putExtra(InstallAppProgress.EXTRA_MANIFEST_DIGEST, mPkgDigest);
         String installerPackageName = getIntent().getStringExtra(
                 Intent.EXTRA_INSTALLER_PACKAGE_NAME);
         if (mOriginatingURI != null) {
diff --git a/src/com/android/packageinstaller/PackageUtil.java b/src/com/android/packageinstaller/PackageUtil.java
index 37e96f0a..ab2b829e 100644
--- a/src/com/android/packageinstaller/PackageUtil.java
+++ b/src/com/android/packageinstaller/PackageUtil.java
@@ -65,9 +65,7 @@ public class PackageUtil {
     public static PackageParser.Package getPackageInfo(File sourceFile) {
         final PackageParser parser = new PackageParser();
         try {
-            PackageParser.Package pkg = parser.parseMonolithicPackage(sourceFile, 0);
-            parser.collectManifestDigest(pkg);
-            return pkg;
+            return parser.parseMonolithicPackage(sourceFile, 0);
         } catch (PackageParserException e) {
             return null;
         }