diff options
| author | yuemingw <yuemingw@google.com> | 2017-10-23 18:36:00 +0100 |
|---|---|---|
| committer | yuemingw <yuemingw@google.com> | 2017-11-22 19:53:18 +0000 |
| commit | 7b1da613467fa6e466f0a99d72fb12f3c54fd433 (patch) | |
| tree | 91489029aed9a04821f86fb7f1a1bb7351ac8e0b /src/com/android/settings/datetime/AutoTimePreferenceController.java | |
| parent | bd642f9db8699f43bbfb76352e52bc31c4c06c21 (diff) | |
| download | packages_apps_Settings-7b1da613467fa6e466f0a99d72fb12f3c54fd433.tar.gz packages_apps_Settings-7b1da613467fa6e466f0a99d72fb12f3c54fd433.tar.bz2 packages_apps_Settings-7b1da613467fa6e466f0a99d72fb12f3c54fd433.zip | |
Block settings when DISALLOW_CONFIG_DATE_TIME.
Test: m -j RunSettingsRoboTests
runtest -x packages/apps/Settings/tests/unit/src/com/android/settings/core/UserRestrictionTest.java
Fix: 67497909
After turn on the user restriction in TestDPC:
https://hsv.googleplex.com/5414119658225664
The date time settings page become:
https://hsv.googleplex.com/5199302573948928
Change-Id: I42590c4a505ec1b6ffa86eb460b90fa6ec8ba783
Diffstat (limited to 'src/com/android/settings/datetime/AutoTimePreferenceController.java')
| -rw-r--r-- | src/com/android/settings/datetime/AutoTimePreferenceController.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/settings/datetime/AutoTimePreferenceController.java b/src/com/android/settings/datetime/AutoTimePreferenceController.java index 0b70f45250..3da712a189 100644 --- a/src/com/android/settings/datetime/AutoTimePreferenceController.java +++ b/src/com/android/settings/datetime/AutoTimePreferenceController.java @@ -46,8 +46,10 @@ public class AutoTimePreferenceController extends AbstractPreferenceController if (!(preference instanceof RestrictedSwitchPreference)) { return; } - ((RestrictedSwitchPreference) preference).setDisabledByAdmin( - getEnforcedAdminProperty()); + if (!((RestrictedSwitchPreference) preference).isDisabledByAdmin()) { + ((RestrictedSwitchPreference) preference).setDisabledByAdmin( + getEnforcedAdminProperty()); + } ((RestrictedSwitchPreference) preference).setChecked(isEnabled()); } |