diff options
| author | Amith Yamasani <yamasani@google.com> | 2014-11-12 03:13:59 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-11-12 03:13:59 +0000 |
| commit | e73cab5f1226f7434fa8bbf341e91891916683c5 (patch) | |
| tree | 7cfb9e7d88a516da3de913584ee697f6558dc92d | |
| parent | 829519dfaab9f2c13492d97556a95300a6908ea4 (diff) | |
| parent | 15de62de26a3ef936a219daf65ec5d388197a9fc (diff) | |
| download | frameworks_base-e73cab5f1226f7434fa8bbf341e91891916683c5.zip frameworks_base-e73cab5f1226f7434fa8bbf341e91891916683c5.tar.gz frameworks_base-e73cab5f1226f7434fa8bbf341e91891916683c5.tar.bz2 | |
Merge "Allow profile owners to set the unknown source setting" into lmp-mr1-dev automerge: 93ffd5d
automerge: 15de62d
* commit '15de62de26a3ef936a219daf65ec5d388197a9fc':
Allow profile owners to set the unknown source setting
| -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); |