commit 0700ff7bdd90b848b9a65c064f18aafeb4f73799
author Rich Cannings <richc@google.com> Wed Aug 08 12:45:59 2012 -0700
committer The Android Automerger <android-build@android.com> Wed Aug 08 15:08:01 2012 -0700
tree 36bbcccfa386cc7dfbb3038717672eea449f13ac
parent 1c0c080af090c0e39842c5b27f185943888ace1c

Revert "Accept and pass URLs to PackageManagerService"

This reverts commit 1c0c080af090c0e39842c5b27f185943888ace1c

Change-Id: I955510c4aa9f7fada2685ca274d0bb8fbdd91cdf

PermissionController/src/com/android/packageinstaller/InstallAppProgress.java

diff --git a/PermissionController/src/com/android/packageinstaller/InstallAppProgress.java b/PermissionController/src/com/android/packageinstaller/InstallAppProgress.java
index 6e471cb..8bfcd4f 100755
--- a/PermissionController/src/com/android/packageinstaller/InstallAppProgress.java
+++ b/PermissionController/src/com/android/packageinstaller/InstallAppProgress.java
@@ -243,13 +243,8 @@
 
         String installerPackageName = getIntent().getStringExtra(
                 Intent.EXTRA_INSTALLER_PACKAGE_NAME);
-        Uri originatingURI = getIntent().getParcelableExtra(Intent.EXTRA_ORIGINATING_URI);
-        Uri referrer = getIntent().getParcelableExtra(Intent.EXTRA_REFERRER);
-
         PackageInstallObserver observer = new PackageInstallObserver();
-
-        pm.installPackageWithOrigin(mPackageURI, observer, installFlags,
-                installerPackageName, originatingURI, referrer);
+        pm.installPackage(mPackageURI, observer, installFlags, installerPackageName);
     }
 
     @Override

PermissionController/src/com/android/packageinstaller/PackageInstallerActivity.java

diff --git a/PermissionController/src/com/android/packageinstaller/PackageInstallerActivity.java b/PermissionController/src/com/android/packageinstaller/PackageInstallerActivity.java
index d76295a..9963103 100644
--- a/PermissionController/src/com/android/packageinstaller/PackageInstallerActivity.java
+++ b/PermissionController/src/com/android/packageinstaller/PackageInstallerActivity.java
@@ -60,9 +60,7 @@
  */
 public class PackageInstallerActivity extends Activity implements OnCancelListener, OnClickListener {
     private static final String TAG = "PackageInstaller";
-    private Uri mPackageURI;
-    private Uri mPackageOriginatingURI;
-    private Uri mPackageReferrer;
+    private Uri mPackageURI;    
     private boolean localLOGV = false;
     PackageManager mPm;
     PackageParser.Package mPkgInfo;
@@ -286,8 +284,6 @@
         // get intent information
         final Intent intent = getIntent();
         mPackageURI = intent.getData();
-        mPackageOriginatingURI = intent.getParcelableExtra(Intent.EXTRA_ORIGINATING_URI);
-        mPackageReferrer = intent.getParcelableExtra(Intent.EXTRA_REFERRER);
         mPm = getPackageManager();
 
         final String scheme = mPackageURI.getScheme();
@@ -368,12 +364,6 @@
             newIntent.setData(mPackageURI);
             newIntent.setClass(this, InstallAppProgress.class);
             String installerPackageName = getIntent().getStringExtra(Intent.EXTRA_INSTALLER_PACKAGE_NAME);
-            if (mPackageOriginatingURI != null) {
-                newIntent.putExtra(Intent.EXTRA_ORIGINATING_URI, mPackageOriginatingURI);
-            }
-            if (mPackageReferrer != null) {
-                newIntent.putExtra(Intent.EXTRA_REFERRER, mPackageReferrer);
-            }
             if (installerPackageName != null) {
                 newIntent.putExtra(Intent.EXTRA_INSTALLER_PACKAGE_NAME, installerPackageName);
             }