diff options
| author | Amith Yamasani <yamasani@google.com> | 2014-10-21 11:14:04 -0700 |
|---|---|---|
| committer | Amith Yamasani <yamasani@google.com> | 2014-11-11 23:38:24 +0000 |
| commit | 52c39a16db077f5017ab20214e60a205e075f2d7 (patch) | |
| tree | 9a5f3219d3632f43e4d4a01ce8039653ad8a1614 | |
| parent | 9114a845d9474bc2ecc807c3f195fe0c5314556c (diff) | |
| download | frameworks_base-52c39a16db077f5017ab20214e60a205e075f2d7.zip frameworks_base-52c39a16db077f5017ab20214e60a205e075f2d7.tar.gz frameworks_base-52c39a16db077f5017ab20214e60a205e075f2d7.tar.bz2 | |
Allow profile owners to set the unknown source setting
This allows work profile MDM to enable unknown sources
even if the user doesn't have UI for it. Installing an
app from an unknown source will still prompt the user
with the package installer dialog, so it's not like the
MDM can now quietly install apps from non-market sources.
Bug: 18316350
Change-Id: Ia8f4fe36f12a258aa888e085acc0b358925f4817
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 1 | ||||
| -rw-r--r-- | services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 9157b1b..33cac75 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -3306,6 +3306,7 @@ public class DevicePolicyManager { * <p>The settings that can be updated by a profile or device owner with this method are: * <ul> * <li>{@link Settings.Secure#DEFAULT_INPUT_METHOD}</li> + * <li>{@link Settings.Secure#INSTALL_NON_MARKET_APPS}</li> * <li>{@link Settings.Secure#SKIP_FIRST_USE_HINTS}</li> * </ul> * <p>A device owner can additionally update the following settings: diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index b3c2155..0713772 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -179,6 +179,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { SECURE_SETTINGS_WHITELIST = new HashSet(); SECURE_SETTINGS_WHITELIST.add(Settings.Secure.DEFAULT_INPUT_METHOD); SECURE_SETTINGS_WHITELIST.add(Settings.Secure.SKIP_FIRST_USE_HINTS); + SECURE_SETTINGS_WHITELIST.add(Settings.Secure.INSTALL_NON_MARKET_APPS); SECURE_SETTINGS_DEVICEOWNER_WHITELIST = new HashSet(); SECURE_SETTINGS_DEVICEOWNER_WHITELIST.addAll(SECURE_SETTINGS_WHITELIST); |