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

am e3e314df: Network Reset should have a lockdown like Factory Reset.

Browse Source 
* commit 'e3e314df4d52881225326d426a76e3e7f1bc40d3':
  Network Reset should have a lockdown like Factory Reset.
This commit is contained in:
Stuart Scott
2015-06-01 16:45:42 +00:00
committed by Android Git Automerger
parent 0736b5a3b9 e3e314df4d
commit ba2a4e4a92
7 changed files with 53 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/android/os/UserManager.java
View File

@@ -199,6 +199,20 @@ public class UserManager {
*/
public static final String DISALLOW_CONFIG_TETHERING = "no_config_tethering";
/**
* Specifies if a user is disallowed from resetting network settings
* from Settings. This can only be set by device owners and profile owners on the primary user.
* The default value is <code>false</code>.
* <p/>This restriction has no effect on secondary users and managed profiles since only the
* primary user can reset the network settings of the device.
*
* <p/>Key for user restrictions.
* <p/>Type: Boolean
* @see #setUserRestrictions(Bundle)
* @see #getUserRestrictions()
*/
public static final String DISALLOW_NETWORK_RESET = "no_network_reset";
/**
* Specifies if a user is disallowed from factory resetting
* from Settings. This can only be set by device owners and profile owners on the primary user.