summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2016-12-07 20:06:57 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2016-12-07 20:06:57 +0000
commit5e4d32ccfc3abf68d265ca63c8b8b485036908d3 (patch)
treee04ee84bd25be86463b50607eb1ab8ca610bc76a
parent52ab98d23b1963b8d644d73cbff5d3b31508d6f1 (diff)
parentac1037c67a24ff209787cf3fca20e09bd7674742 (diff)
downloadplatform_packages_apps_PackageInstaller-o-preview.tar.gz
platform_packages_apps_PackageInstaller-o-preview.tar.bz2
platform_packages_apps_PackageInstaller-o-preview.zip
Merge "stop incorrectly showing unknown sources prompt"android-o-preview-1android-n-mr2-preview-2android-n-mr2-preview-1o-preview
-rw-r--r--src/com/android/packageinstaller/PackageInstallerActivity.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/packageinstaller/PackageInstallerActivity.java b/src/com/android/packageinstaller/PackageInstallerActivity.java
index cf264d125..c9812f486 100644
--- a/src/com/android/packageinstaller/PackageInstallerActivity.java
+++ b/src/com/android/packageinstaller/PackageInstallerActivity.java
@@ -474,6 +474,7 @@ public class PackageInstallerActivity extends Activity implements OnCancelListen
final boolean requestFromUnknownSource = isInstallRequestFromUnknownSource(getIntent());
if (!requestFromUnknownSource) {
initiateInstall();
+ return;
}
// If the admin prohibits it, or we're running in a managed profile, just show error