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

Commit 2a339992 authored by Neil Fuller's avatar Neil Fuller Committed by Android Build Coastguard Worker
Browse files

Restore enterprise policy checks 

Restore enterprise policy checks removed by commit
fdab44f9 and not since restored by other
changes.

Bug: 325886855
Bug: 316584466
Bug: 235445309
Test: Treehugger only
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:5d80553a155524e73713348fc11b9f98bee0308b)
Merged-In: Id3d79805bb2289b84ad34ac05a97e50f0410502f
Change-Id: Id3d79805bb2289b84ad34ac05a97e50f0410502f
parent ca5ff1a5

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

    }