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

Merge \"Global.OEM_UNLOCK_DISALLOWED should only restrict when enabling oem\" into nyc-mr1-dev

Browse Source 
am: 186768150f

Change-Id: Id35463500a31ff6e6d834c706e228d05c5d15918
This commit is contained in:
Mahaver Chopra
2016-06-16 16:53:43 +00:00
committed by android-build-merger
parent b901e4c4e6 186768150f
commit d3a0f10b8d
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/PersistentDataBlockService.java
View File

@@ -466,12 +466,13 @@ public class PersistentDataBlockService extends SystemService {
enforceOemUnlockWritePermission();
enforceIsAdmin();
// Do not allow oem unlock modification if it has been disallowed.
if (Settings.Global.getInt(getContext().getContentResolver(),
Settings.Global.OEM_UNLOCK_DISALLOWED, 0) == 1) {
throw new SecurityException("OEM unlock has been disallowed.");
}
if (enabled) {
// Do not allow oem unlock to be enabled if it has been disallowed.
if (Settings.Global.getInt(getContext().getContentResolver(),
Settings.Global.OEM_UNLOCK_DISALLOWED, 0) == 1) {
throw new SecurityException(
"OEM unlock has been disallowed by OEM_UNLOCK_DISALLOWED.");
}
enforceFactoryResetAllowed();
}
synchronized (mLock) {

2
services/core/java/com/android/server/pm/UserRestrictionsUtils.java
View File

@@ -429,7 +429,7 @@ public class UserRestrictionsUtils {
if (newValue) {
PersistentDataBlockManager manager = (PersistentDataBlockManager) context
.getSystemService(Context.PERSISTENT_DATA_BLOCK_SERVICE);
if (manager != null) {
if (manager != null && manager.getOemUnlockEnabled()) {
manager.setOemUnlockEnabled(false);
}
}