Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Allow profile owners to set the unknown source setting" into lmp-mr1-dev automerge: 93ffd5d

Browse Source 
automerge: 15de62d

* commit '15de62de26a3ef936a219daf65ec5d388197a9fc':
  Allow profile owners to set the unknown source setting
This commit is contained in:
Amith Yamasani
2014-11-12 03:13:59 +00:00
committed by android-build-merger
parent 829519dfaa 15de62de26
commit e73cab5f12
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/android/app/admin/DevicePolicyManager.java
View File

@@ -3306,6 +3306,7 @@ public class DevicePolicyManager {
* <p>The settings that can be updated by a profile or device owner with this method are: * <p>The settings that can be updated by a profile or device owner with this method are:
* <ul> * <ul>
* <li>{@link Settings.Secure#DEFAULT_INPUT_METHOD}</li> * <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> * <li>{@link Settings.Secure#SKIP_FIRST_USE_HINTS}</li>
* </ul> * </ul>
* <p>A device owner can additionally update the following settings: * <p>A device owner can additionally update the following settings:

1
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
View File

@@ -179,6 +179,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
SECURE_SETTINGS_WHITELIST = new HashSet(); SECURE_SETTINGS_WHITELIST = new HashSet();
SECURE_SETTINGS_WHITELIST.add(Settings.Secure.DEFAULT_INPUT_METHOD); 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.SKIP_FIRST_USE_HINTS);
SECURE_SETTINGS_WHITELIST.add(Settings.Secure.INSTALL_NON_MARKET_APPS);
SECURE_SETTINGS_DEVICEOWNER_WHITELIST = new HashSet(); SECURE_SETTINGS_DEVICEOWNER_WHITELIST = new HashSet();
SECURE_SETTINGS_DEVICEOWNER_WHITELIST.addAll(SECURE_SETTINGS_WHITELIST); SECURE_SETTINGS_DEVICEOWNER_WHITELIST.addAll(SECURE_SETTINGS_WHITELIST);