| commit | 9e84da322ae4eb2d6a89b412ec58da8423feb946 | [log] [tgz] |
|---|---|---|
| author | Mahaver Chopra <mahaver@google.com> | Sun Jul 10 16:58:31 2016 +0100 |
| committer | Mahaver Chopra <mahaver@google.com> | Sun Jul 10 16:58:31 2016 +0100 |
| tree | 910df86b450f2171a4371b6ebf2639fdc7c3a2b3 | |
| parent | 3571d10f0e25c9c3457419c8cf14e12492a9424e [diff] |
Use UM.DISALLOW_OEM_UNLOCK instead of Global.OEM_UNLOCK_DISALLOWED Currently we used global setting to restrict user from enabling oem unlock. As global settings can be chagned using adb, using user restrictions instead. Bug: 29893399 Change-Id: I3eab3b323ed3d1da7fcf3b26560a6fa04ec0f1f9
diff --git a/Settings/src/com/android/tv/settings/system/development/DevelopmentFragment.java b/Settings/src/com/android/tv/settings/system/development/DevelopmentFragment.java index 40e577e..d119a65 100644 --- a/Settings/src/com/android/tv/settings/system/development/DevelopmentFragment.java +++ b/Settings/src/com/android/tv/settings/system/development/DevelopmentFragment.java
@@ -843,8 +843,7 @@ } private boolean isOemUnlockAllowed() { - return Settings.Global.getInt(getActivity().getContentResolver(), - Settings.Global.OEM_UNLOCK_DISALLOWED, 0) == 0; + return !mUm.hasUserRestriction(UserManager.DISALLOW_OEM_UNLOCK); } private void updateBugreportOptions() {