diff options
| author | Amith Yamasani <yamasani@google.com> | 2014-11-12 00:07:57 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-11-12 00:07:59 +0000 |
| commit | 93ffd5dc0a243af87f8ba106fe98df7a7ed2c484 (patch) | |
| tree | a4f2150c17069d602fbfee6a3f36fb140a64998c /core/java/android | |
| parent | 2eb5a5f727d4692b70b68cb4b1b7e31bf74f13a4 (diff) | |
| parent | 52c39a16db077f5017ab20214e60a205e075f2d7 (diff) | |
Merge "Allow profile owners to set the unknown source setting" into lmp-mr1-dev
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 9157b1b16b7d..33cac75027e8 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: |