commit 6309299e07981192ff578f7f8f470dab109280da
author Svet Ganov <svetoslavganov@google.com> Thu Jun 09 00:50:04 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jun 09 00:50:04 2016 +0000
tree bc3bb785848a0ade61262b6e726799274271cead
parent 48a8d45a398212de63d1f8931b9d558507598447
parent 869786e3e44a4ef9ce54c7208e97490b1cdb2608

Fix a crash in package installer
am: 869786e3e4

Change-Id: Iece0247260ac00e60179a035acb66dd0278baaff

src/com/android/packageinstaller/InstallAppProgress.java

diff --git a/src/com/android/packageinstaller/InstallAppProgress.java b/src/com/android/packageinstaller/InstallAppProgress.java
index e93c93c..c6e3a46 100755
--- a/src/com/android/packageinstaller/InstallAppProgress.java
+++ b/src/com/android/packageinstaller/InstallAppProgress.java
@@ -351,7 +351,6 @@
             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

src/com/android/packageinstaller/PackageInstallerActivity.java

diff --git a/src/com/android/packageinstaller/PackageInstallerActivity.java b/src/com/android/packageinstaller/PackageInstallerActivity.java
index 6692d66..1903f91 100644
--- a/src/com/android/packageinstaller/PackageInstallerActivity.java
+++ b/src/com/android/packageinstaller/PackageInstallerActivity.java
@@ -456,7 +456,7 @@
         // Block the install attempt on the Unknown Sources setting if necessary.
         final boolean requestFromUnknownSource = isInstallRequestFromUnknownSource(intent);
         if (!requestFromUnknownSource) {
-            initiateInstall();
+            processPackageUri(packageUri);
             return;
         }