Fix time zone settings restriction logic
- Time zone should be restricted when "no_config_date_time" enabled Bug: 316584466 Change-Id: I90dfc2c84ef0b2155740c7b890f17376c9e57e51 Test: manual via TestDPC
This commit is contained in:
@@ -26,6 +26,7 @@ import androidx.annotation.VisibleForTesting;
|
||||
import androidx.preference.Preference;
|
||||
|
||||
import com.android.settings.core.BasePreferenceController;
|
||||
import com.android.settingslib.RestrictedPreference;
|
||||
import com.android.settingslib.datetime.ZoneGetter;
|
||||
|
||||
import java.util.Calendar;
|
||||
@@ -52,6 +53,12 @@ public class TimeZonePreferenceController extends BasePreferenceController {
|
||||
@Override
|
||||
public void updateState(Preference preference) {
|
||||
super.updateState(preference);
|
||||
|
||||
if (preference instanceof RestrictedPreference
|
||||
&& ((RestrictedPreference) preference).isDisabledByAdmin()) {
|
||||
return;
|
||||
}
|
||||
|
||||
preference.setEnabled(shouldEnableManualTimeZoneSelection());
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user