Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d0fcba93 authored by Edgar Wang's avatar Edgar Wang
Browse files

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
parent 59d67c3d

src/com/android/settings/datetime/TimeZonePreferenceController.java

+7 −0
Original line number Diff line number Diff line
@@ -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());

    }