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

Commit d3a0f10b authored by Mahaver Chopra's avatar Mahaver Chopra Committed by android-build-merger
Browse files

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

am: 18676815

Change-Id: Id35463500a31ff6e6d834c706e228d05c5d15918
parents b901e4c4 18676815

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

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

            enforceOemUnlockWritePermission();

            enforceIsAdmin();

            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(),

                if (Settings.Global.getInt(getContext().getContentResolver(),

                        Settings.Global.OEM_UNLOCK_DISALLOWED, 0) == 1) {

                        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();

                enforceFactoryResetAllowed();

            }

            }

            synchronized (mLock) {

            synchronized (mLock) {

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -429,7 +429,7 @@ public class UserRestrictionsUtils { 
                    if (newValue) {

                    if (newValue) {

                        PersistentDataBlockManager manager = (PersistentDataBlockManager) context

                        PersistentDataBlockManager manager = (PersistentDataBlockManager) context

                                .getSystemService(Context.PERSISTENT_DATA_BLOCK_SERVICE);

                                .getSystemService(Context.PERSISTENT_DATA_BLOCK_SERVICE);

                        if (manager != null) {

                        if (manager != null && manager.getOemUnlockEnabled()) {

                            manager.setOemUnlockEnabled(false);

                            manager.setOemUnlockEnabled(false);

                        }

                        }

                    }

                    }