summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSvet Ganov <svetoslavganov@google.com>2016-06-09 00:50:03 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-06-09 00:50:03 +0000
commit153e51bd979339f890e1a554573df63b6b57c7ef (patch)
tree14b8f792839cfb5bf1174b332e31d418fdbfaebb /src
parentb8a35e60f91bdd283617128dbd01e70931a91b0b (diff)
parent869786e3e44a4ef9ce54c7208e97490b1cdb2608 (diff)
downloadandroid_packages_apps_PackageInstaller-153e51bd979339f890e1a554573df63b6b57c7ef.tar.gz
android_packages_apps_PackageInstaller-153e51bd979339f890e1a554573df63b6b57c7ef.tar.bz2
android_packages_apps_PackageInstaller-153e51bd979339f890e1a554573df63b6b57c7ef.zip
Fix a crash in package installer
am: 869786e3e4 Change-Id: Ic1d8d6221194731a6c967f736a1352a905bba8b0
Diffstat (limited to 'src')
-rwxr-xr-xsrc/com/android/packageinstaller/InstallAppProgress.java1
-rw-r--r--src/com/android/packageinstaller/PackageInstallerActivity.java2
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;
}