OSDN Git Service

Policy transparency when DISALLOW_FACTORY_RESET prevents OEM unlock.
authorAndrew Scull <ascull@google.com>
Wed, 6 Sep 2017 16:53:25 +0000 (17:53 +0100)
committerAndrew Scull <ascull@google.com>
Fri, 8 Sep 2017 11:40:25 +0000 (12:40 +0100)
commit0aa45bed65f544e68e0d38f255da005b3ce9fddf
treea79f70f66ad5738cdc3cf11306dfb04d25ec4041
parentd2a65d5f037da1e1b2cae1d0df22b7d02eac2d24
Policy transparency when DISALLOW_FACTORY_RESET prevents OEM unlock.

If an admin has set the DISALLOW_FACTORY_RESET user restriction, OEM
unlock is also restricted. If this is the case, it should be explained
to the user that the admin is preventing the OEM unlock.

DISALLOW_OEM_UNLOCK is deprecated and now managed by OemLockManager.
This restriction is also one set by the carrier, not an admin.

Test: RunSettingsRoboTests
Test: CTS verifier test from the bug
Bug: 65124732
Change-Id: I8bde87a522742a7cbda006eee17c2a19797b1835
src/com/android/settings/development/DevelopmentSettings.java
tests/robotests/src/android/service/oemlock/OemLockManager.java