OSDN Git Service

Disallow OEM unlock when DISALLOW_FACTORY_RESET applies
authorMahaver Chopra <mahaver@google.com>
Tue, 17 May 2016 17:53:09 +0000 (18:53 +0100)
committerMahaver Chopra <mahaver@google.com>
Tue, 24 May 2016 12:03:40 +0000 (12:03 +0000)
commit830e32cdccdeeeadc5f07ba006b2b5779f8be65d
tree2732a0ccb7604858976af428ae24c03fdc6aa755
parent8cbec3de0fe81f1b9b5379f87167cd23f3926225
Disallow OEM unlock when DISALLOW_FACTORY_RESET applies

Bug: 28339424
Change-Id: I4b6dc6f186ea60a13e778f52d574e615b0b19b74
services/core/java/com/android/server/PersistentDataBlockService.java
services/core/java/com/android/server/pm/UserRestrictionsUtils.java