summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Micay <danielmicay@gmail.com>2016-12-07 20:15:21 (GMT)
committerPhilip P. Moltmann <moltmann@google.com>2016-12-13 23:58:52 (GMT)
commit6d4fdd4fb25e7b1611174e7d12d2edeec8766967 (patch)
tree599a42797056361f912662eebd300604ecd795eb
parenta24e8d087c5065230a42784e7d7aa877273a0626 (diff)
downloadandroid_packages_apps_PackageInstaller-6d4fdd4fb25e7b1611174e7d12d2edeec8766967.zip
android_packages_apps_PackageInstaller-6d4fdd4fb25e7b1611174e7d12d2edeec8766967.tar.gz
android_packages_apps_PackageInstaller-6d4fdd4fb25e7b1611174e7d12d2edeec8766967.tar.bz2
Merge "stop incorrectly showing unknown sources prompt" am: 5e4d32ccfc
am: e931327ee0 Fixes: 33578153 Change-Id: I9b7f116b8c05d5e3da71d31266bf94ac38ef987d (cherry picked from commit b2ebcceb8d04dcf85e7d49af1630de60af2bf6f1)
-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 55a1f81..de68582 100644
--- a/src/com/android/packageinstaller/PackageInstallerActivity.java
+++ b/src/com/android/packageinstaller/PackageInstallerActivity.java
@@ -477,6 +477,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