commit b26b9425d700359d6ee68d45ac334fd1f2ab82d4
author gitbuildkicker <android-build@google.com> Tue Oct 18 00:06:49 2016 -0700
committer gitbuildkicker <android-build@google.com> Tue Oct 18 00:06:49 2016 -0700
tree 988fe3fed916f773aebe69a0d059cecf2e473bff
parent df52c788dab741a070d195de2fe6cc9edc1f404c
parent a407175546d9196fee9bd12ef1034856825d8476

merge in nyc-mr1-release history after reset to nyc-mr1-dev

src/com/android/packageinstaller/PackageInstallerActivity.java

diff --git a/src/com/android/packageinstaller/PackageInstallerActivity.java b/src/com/android/packageinstaller/PackageInstallerActivity.java
index cf264d1..55a1f81 100644
--- a/src/com/android/packageinstaller/PackageInstallerActivity.java
+++ b/src/com/android/packageinstaller/PackageInstallerActivity.java
@@ -327,7 +327,7 @@
         // 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 @@
             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 @@
         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 @@
         } 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 @@
 
             boolean wasSetUp = processPackageUri(fileUri);
             if (wasSetUp) {
-                checkIfAllowedAndInitiateInstall();
+                checkIfAllowedAndInitiateInstall(false);
             }
         }