summaryrefslogtreecommitdiffstats
path: root/src/com/android/packageinstaller/PackageInstallerActivity.java
diff options
context:
space:
mode:
authorDaniel Micay <danielmicay@gmail.com>2016-12-07 20:15:21 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-12-07 20:15:21 +0000
commitb2ebcceb8d04dcf85e7d49af1630de60af2bf6f1 (patch)
tree31ee55f5e392920a60c8685a516f90bbfd694a90 /src/com/android/packageinstaller/PackageInstallerActivity.java
parent1042f1179642d03534f7bdb904525fd20c605adb (diff)
parente931327ee059eb0632a255590db32ddd3ef99fbe (diff)
downloadandroid_packages_apps_PackageInstaller-b2ebcceb8d04dcf85e7d49af1630de60af2bf6f1.tar.gz
android_packages_apps_PackageInstaller-b2ebcceb8d04dcf85e7d49af1630de60af2bf6f1.tar.bz2
android_packages_apps_PackageInstaller-b2ebcceb8d04dcf85e7d49af1630de60af2bf6f1.zip
Merge "stop incorrectly showing unknown sources prompt" am: 5e4d32ccfc
am: e931327ee0 Change-Id: I9b7f116b8c05d5e3da71d31266bf94ac38ef987d
Diffstat (limited to 'src/com/android/packageinstaller/PackageInstallerActivity.java')
-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 55a1f814..de685825 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