Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18676815 authored Jun 16, 2016 by Mahaver Chopra Committed by Android (Google) Code Review Jun 16, 2016

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

parents 092d9613 d444ff12

services/core/java/com/android/server/PersistentDataBlockService.java

+6 −5

Original line number	Diff line number	Diff line
		@@ -466,12 +466,13 @@ public class PersistentDataBlockService extends SystemService {
		enforceOemUnlockWritePermission();
		enforceIsAdmin();

		// Do not allow oem unlock modification if it 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.");
		throw new SecurityException(
		"OEM unlock has been disallowed by OEM_UNLOCK_DISALLOWED.");
		}
		if (enabled) {
		enforceFactoryResetAllowed();
		}
		synchronized (mLock) {

services/core/java/com/android/server/pm/UserRestrictionsUtils.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);
		}
		}