summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/development/OemUnlockPreferenceController.java
diff options
context:
space:
mode:
authorjeffreyhuang <jeffreyhuang@google.com>2017-11-28 11:56:57 -0800
committerjeffreyhuang <jeffreyhuang@google.com>2017-11-28 12:01:12 -0800
commit0545d6e7d70ac10a2c77b88c5b6ee00a7e6da553 (patch)
tree38ad979d7bc0805725857fc1bf9d26d521897bb2 /src/com/android/settings/development/OemUnlockPreferenceController.java
parent6a68f306d7bec0c9d1178c579880cdbed7d61ec8 (diff)
downloadpackages_apps_Settings-0545d6e7d70ac10a2c77b88c5b6ee00a7e6da553.tar.gz
packages_apps_Settings-0545d6e7d70ac10a2c77b88c5b6ee00a7e6da553.tar.bz2
packages_apps_Settings-0545d6e7d70ac10a2c77b88c5b6ee00a7e6da553.zip
Move OemUnlockPreferenceControllerTest to sdk 26
Test: make RunSettingsRoboTests -j40 Change-Id: I25d96c82bd99c5c7adba6b6269f1a5735b22ca5b
Diffstat (limited to 'src/com/android/settings/development/OemUnlockPreferenceController.java')
-rw-r--r--src/com/android/settings/development/OemUnlockPreferenceController.java10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/com/android/settings/development/OemUnlockPreferenceController.java b/src/com/android/settings/development/OemUnlockPreferenceController.java
index f486b3d3d2..c6ba60c8c3 100644
--- a/src/com/android/settings/development/OemUnlockPreferenceController.java
+++ b/src/com/android/settings/development/OemUnlockPreferenceController.java
@@ -98,7 +98,7 @@ public class OemUnlockPreferenceController extends DeveloperOptionsPreferenceCon
@Override
public void updateState(Preference preference) {
super.updateState(preference);
- mPreference.setChecked(mOemLockManager.isOemUnlockAllowed());
+ mPreference.setChecked(isOemUnlockedAllowed());
updateOemUnlockSettingDescription();
// Showing mEnableOemUnlock preference as device has persistent data block.
mPreference.setDisabledByAdmin(null);
@@ -183,7 +183,8 @@ public class OemUnlockPreferenceController extends DeveloperOptionsPreferenceCon
/**
* Returns {@code true} if the bootloader has been unlocked. Otherwise, returns {code false}.
*/
- private boolean isBootloaderUnlocked() {
+ @VisibleForTesting
+ boolean isBootloaderUnlocked() {
return mOemLockManager.isDeviceOemUnlocked();
}
@@ -216,4 +217,9 @@ public class OemUnlockPreferenceController extends DeveloperOptionsPreferenceCon
userHandle);
}
+ @VisibleForTesting
+ boolean isOemUnlockedAllowed() {
+ return mOemLockManager.isOemUnlockAllowed();
+ }
+
}