3d9805d50281882b4420ee2d4ede8a8bdd94d455 - platform/frameworks/base

commit	3d9805d50281882b4420ee2d4ede8a8bdd94d455	[log] [tgz]
author	Mahaver Chopra <mahaver@google.com>	Thu Jul 07 16:25:05 2016 +0100
committer	Mahaver Chopra <mahaver@google.com>	Tue Jul 12 19:29:14 2016 +0100
tree	eadca4fde21820e3564bcf6e66ef4ead258705b0
parent	7e10bcffc5fb34ea2051961ed07838c93018fd94 [diff]

Added UM.DISALLOW_OEM_UNLOCK, Removed Global.OEM_UNLOCK_DISALLOWED.

Currently we used global setting to restrict user from enabling oem
unlock. As global settings can be chagned using adb, using user
restrictions instead.

Bug: 29893399
Change-Id: Ic83112a4838b8279bf50408a29ae205e0b8639ee

core/java/android/os/UserManager.java[diff]
core/java/android/provider/Settings.java[diff]
core/res/res/values/config.xml[diff]
core/res/res/values/symbols.xml[diff]
packages/SettingsProvider/res/values/defaults.xml[diff]
packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java[diff]
services/core/java/com/android/server/PersistentDataBlockService.java[diff]
services/core/java/com/android/server/pm/UserManagerService.java[diff]
services/core/java/com/android/server/pm/UserRestrictionsUtils.java[diff]

9 files changed

tree: eadca4fde21820e3564bcf6e66ef4ead258705b0