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

Commit 13afe112 authored by Edgar Wang's avatar Edgar Wang Committed by Android (Google) Code Review
Browse files

Merge "Fix time zone settings restriction logic" into main

parents 52ebf585 d0fcba93

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());

    }