diff options
| author | Sudheer Shanka <sudheersai@google.com> | 2016-02-09 17:41:19 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-02-09 17:41:19 +0000 |
| commit | 8c73974b359e24d797ab57a1c3db17f5474d1b63 (patch) | |
| tree | 611582e394131b5c52785e21dc20878fa15203fd | |
| parent | 74b57b79d49cf05090dad44c1f8a98830a10fc9d (diff) | |
| parent | fca0a5ce227da4a4ab4aed309137e22bb27112a1 (diff) | |
| download | android_packages_apps_PackageInstaller-8c73974b359e24d797ab57a1c3db17f5474d1b63.tar.gz android_packages_apps_PackageInstaller-8c73974b359e24d797ab57a1c3db17f5474d1b63.tar.bz2 android_packages_apps_PackageInstaller-8c73974b359e24d797ab57a1c3db17f5474d1b63.zip | |
Merge "Show support dialog when admin disallows installs from unknown sources." into nyc-dev
| -rw-r--r-- | src/com/android/packageinstaller/PackageInstallerActivity.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/packageinstaller/PackageInstallerActivity.java b/src/com/android/packageinstaller/PackageInstallerActivity.java index e3ad4f34..79500e6e 100644 --- a/src/com/android/packageinstaller/PackageInstallerActivity.java +++ b/src/com/android/packageinstaller/PackageInstallerActivity.java @@ -517,8 +517,10 @@ public class PackageInstallerActivity extends Activity implements OnCancelListen // If the admin prohibits it, or we're running in a managed profile, just show error // and exit. Otherwise show an option to take the user to Settings to change the setting. final boolean isManagedProfile = mUserManager.isManagedProfile(); - if (!unknownSourcesAllowedByAdmin - || (!unknownSourcesAllowedByUser && isManagedProfile)) { + if (!unknownSourcesAllowedByAdmin) { + startActivity(new Intent(Settings.ACTION_SHOW_ADMIN_SUPPORT_DETAILS)); + finish(); + } else if (!unknownSourcesAllowedByUser && isManagedProfile) { showDialogInner(DLG_ADMIN_RESTRICTS_UNKNOWN_SOURCES); } else if (!unknownSourcesAllowedByUser) { // Ask user to enable setting first |