Fix a crash in package installer

The first bug was that we were starting the install before
having the package info for the installed app. The second
was that we were calling the permission review UI despite
we were there before the user selected to install. i.e. the
user already reviewed the permissions.

bug:29197887

Change-Id: I2fac4d014dde7f7744a6b831c2b0ff510e29e8e8

2 files changed, 1 insertions, 2 deletions

diff --git a/src/com/android/packageinstaller/InstallAppProgress.java b/src/com/android/packageinstaller/InstallAppProgress.java
index e93c93c7..c6e3a46c 100755
--- a/src/com/android/packageinstaller/InstallAppProgress.java
+++ b/src/com/android/packageinstaller/InstallAppProgress.java
@@ -351,7 +351,6 @@ public class InstallAppProgress extends Activity implements View.OnClickListener
             params.originatingUri = getIntent().getParcelableExtra(Intent.EXTRA_ORIGINATING_URI);
             params.originatingUid = getIntent().getIntExtra(Intent.EXTRA_ORIGINATING_UID,
                     UID_UNKNOWN);
-            params.setInstallFlagsForcePermissionPrompt();
 
             mInstallHandler.post(new Runnable() {
                 @Override
diff --git a/src/com/android/packageinstaller/PackageInstallerActivity.java b/src/com/android/packageinstaller/PackageInstallerActivity.java
index 6692d66a..1903f917 100644
--- a/src/com/android/packageinstaller/PackageInstallerActivity.java
+++ b/src/com/android/packageinstaller/PackageInstallerActivity.java
@@ -456,7 +456,7 @@ public class PackageInstallerActivity extends Activity implements OnCancelListen
         // Block the install attempt on the Unknown Sources setting if necessary.
         final boolean requestFromUnknownSource = isInstallRequestFromUnknownSource(intent);
         if (!requestFromUnknownSource) {
-            initiateInstall();
+            processPackageUri(packageUri);
             return;
         }