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

Commit c365d864 authored by Neil Fuller's avatar Neil Fuller Committed by Android (Google) Code Review
Browse files

Merge "Restore enterprise policy checks" into main

parents c55cd952 5d80553a

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

+6 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import androidx.annotation.VisibleForTesting; 
import androidx.preference.Preference;



import com.android.settings.core.BasePreferenceController;

import com.android.settingslib.RestrictedPreference;



import java.util.Calendar;
@@ -68,6 +69,11 @@ public class DatePreferenceController extends BasePreferenceController 
    @Override

    public void updateState(Preference preference) {

        super.updateState(preference);



        if (preference instanceof RestrictedPreference

                && ((RestrictedPreference) preference).isDisabledByAdmin()) {

            return;

        }

        preference.setEnabled(isEnabled());

    }

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

+6 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import android.widget.TimePicker; 
import androidx.preference.Preference;



import com.android.settings.core.BasePreferenceController;

import com.android.settingslib.RestrictedPreference;



import java.util.Calendar;
@@ -66,6 +67,11 @@ public class TimePreferenceController extends BasePreferenceController 
    @Override

    public void updateState(Preference preference) {

        super.updateState(preference);



        if (preference instanceof RestrictedPreference

                && ((RestrictedPreference) preference).isDisabledByAdmin()) {

            return;

        }

        preference.setEnabled(isEnabled());

    }