summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilip P. Moltmann <moltmann@google.com>2016-10-13 10:42:57 -0700
committerPhilip P. Moltmann <moltmann@google.com>2016-10-13 17:45:20 +0000
commitdf52c788dab741a070d195de2fe6cc9edc1f404c (patch)
tree988fe3fed916f773aebe69a0d059cecf2e473bff
parentb4090d16e423700984d0a3e015938806bfd55327 (diff)
downloadandroid_packages_apps_PackageInstaller-df52c788dab741a070d195de2fe6cc9edc1f404c.tar.gz
android_packages_apps_PackageInstaller-df52c788dab741a070d195de2fe6cc9edc1f404c.tar.bz2
android_packages_apps_PackageInstaller-df52c788dab741a070d195de2fe6cc9edc1f404c.zip
Support install once feature.
Test: Simulated OK result from settings and triggered run-once workflow Fixes: 32105068 Change-Id: I9f6c3b56b09d520d2bc9c6eeb6c75f151e3f1aff
-rw-r--r--src/com/android/packageinstaller/PackageInstallerActivity.java26
1 files changed, 18 insertions, 8 deletions
diff --git a/src/com/android/packageinstaller/PackageInstallerActivity.java b/src/com/android/packageinstaller/PackageInstallerActivity.java
index cf264d12..55a1f814 100644
--- a/src/com/android/packageinstaller/PackageInstallerActivity.java
+++ b/src/com/android/packageinstaller/PackageInstallerActivity.java
@@ -327,7 +327,7 @@ public class PackageInstallerActivity extends Activity implements OnCancelListen
// whether the untrusted sources setting is on. This allows partners to
// implement a "allow untrusted source once" feature.
if (request == REQUEST_ENABLE_UNKNOWN_SOURCES && result == RESULT_OK) {
- checkIfAllowedAndInitiateInstall();
+ checkIfAllowedAndInitiateInstall(true);
} else {
clearCachedApkIfNeededAndFinish();
}
@@ -462,14 +462,17 @@ public class PackageInstallerActivity extends Activity implements OnCancelListen
return;
}
- checkIfAllowedAndInitiateInstall();
+ checkIfAllowedAndInitiateInstall(false);
}
/**
* Check if it is allowed to install the package and initiate install if allowed. If not allowed
* show the appropriate dialog.
+ *
+ * @param ignoreUnknownSourcesSettings Ignore {@link #isUnknownSourcesEnabled()} and proceed
+ * even if this would prevented installation.
*/
- private void checkIfAllowedAndInitiateInstall() {
+ private void checkIfAllowedAndInitiateInstall(boolean ignoreUnknownSourcesSettings) {
// Block the install attempt on the Unknown Sources setting if necessary.
final boolean requestFromUnknownSource = isInstallRequestFromUnknownSource(getIntent());
if (!requestFromUnknownSource) {
@@ -482,7 +485,11 @@ public class PackageInstallerActivity extends Activity implements OnCancelListen
if (isUnknownSourcesDisallowed()) {
if ((mUserManager.getUserRestrictionSource(UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES,
Process.myUserHandle()) & UserManager.RESTRICTION_SOURCE_SYSTEM) != 0) {
- showDialogInner(DLG_UNKNOWN_SOURCES);
+ if (ignoreUnknownSourcesSettings) {
+ initiateInstall();
+ } else {
+ showDialogInner(DLG_UNKNOWN_SOURCES);
+ }
} else {
startActivity(new Intent(Settings.ACTION_SHOW_ADMIN_SUPPORT_DETAILS));
clearCachedApkIfNeededAndFinish();
@@ -490,9 +497,12 @@ public class PackageInstallerActivity extends Activity implements OnCancelListen
} else if (!isUnknownSourcesEnabled() && isManagedProfile) {
showDialogInner(DLG_ADMIN_RESTRICTS_UNKNOWN_SOURCES);
} else if (!isUnknownSourcesEnabled()) {
- // Ask user to enable setting first
-
- showDialogInner(DLG_UNKNOWN_SOURCES);
+ if (ignoreUnknownSourcesSettings) {
+ initiateInstall();
+ } else {
+ // Ask user to enable setting first
+ showDialogInner(DLG_UNKNOWN_SOURCES);
+ }
} else {
initiateInstall();
}
@@ -801,7 +811,7 @@ public class PackageInstallerActivity extends Activity implements OnCancelListen
boolean wasSetUp = processPackageUri(fileUri);
if (wasSetUp) {
- checkIfAllowedAndInitiateInstall();
+ checkIfAllowedAndInitiateInstall(false);
}
}