Merge "Policy transparency when DISALLOW_FACTORY_RESET prevents OEM unlock." into oc-mr1-dev

2017-09-08 19:08:48 +00:00
parent 194638ac78 2ca3017f8e
commit 0bac26b6cd
2 changed files with 14 additions and 9 deletions
--- a/tests/robotests/src/android/service/oemlock/OemLockManager.java
+++ b/tests/robotests/src/android/service/oemlock/OemLockManager.java
@@ -32,9 +32,6 @@ public class OemLockManager {
        return false;
    }

-    public boolean canUserAllowOemUnlock() {
-        return true;
-    }
    public boolean isOemUnlockAllowed() {
        return false;
    }