diff options
| author | Amith Yamasani <yamasani@google.com> | 2014-11-11 15:36:15 -0800 |
|---|---|---|
| committer | Amith Yamasani <yamasani@google.com> | 2014-11-11 23:39:58 +0000 |
| commit | ceceb2ab07aab457a4229d051de222ad88ed62a1 (patch) | |
| tree | 87159bcc2c6e621f08df90b310bfb790c0ea40b0 /src/com/android/settings/SecuritySettings.java | |
| parent | aa762831729e7c91c10184f11b978bd501b94e71 (diff) | |
| download | packages_apps_Settings-ceceb2ab07aab457a4229d051de222ad88ed62a1.zip packages_apps_Settings-ceceb2ab07aab457a4229d051de222ad88ed62a1.tar.gz packages_apps_Settings-ceceb2ab07aab457a4229d051de222ad88ed62a1.tar.bz2 | |
Fix a regression in enabling unknown sources toggle
In Security Settings, allow unknown sources to be
toggled for primary and secondary users unless it
is a restricted profile or there is a device policy
restriction to disallow installing apps or installing
from unknown sources.
Bug: 18277370
Change-Id: I9f0b6cd603c4c8deb77d36af1b82cace43ba195f
Diffstat (limited to 'src/com/android/settings/SecuritySettings.java')
| -rw-r--r-- | src/com/android/settings/SecuritySettings.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java index aa27e3b..ab08553 100644 --- a/src/com/android/settings/SecuritySettings.java +++ b/src/com/android/settings/SecuritySettings.java @@ -336,7 +336,8 @@ public class SecuritySettings extends SettingsPreferenceFragment KEY_TOGGLE_INSTALL_APPLICATIONS); mToggleAppInstallation.setChecked(isNonMarketAppsAllowed()); // Side loading of apps. - mToggleAppInstallation.setEnabled(mIsPrimary); + // Disable for restricted profiles. For others, check if policy disallows it. + mToggleAppInstallation.setEnabled(!um.getUserInfo(UserHandle.myUserId()).isRestricted()); if (um.hasUserRestriction(UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES) || um.hasUserRestriction(UserManager.DISALLOW_INSTALL_APPS)) { mToggleAppInstallation.setEnabled(false); |