PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Policy transparency when DISALLOW_FACTORY_RESET prevents OEM unlock.

Browse Source 
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
This commit is contained in:
Andrew Scull
2017-09-06 17:53:25 +01:00
parent d2a65d5f03
commit 0aa45bed65
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/robotests/src/android/service/oemlock/OemLockManager.java
View File

@@ -32,9 +32,6 @@ public class OemLockManager {
return false;
}
public boolean canUserAllowOemUnlock() {
return true;
}
public boolean isOemUnlockAllowed() {
return false;
}