Restore enterprise policy checks

Restore enterprise policy checks removed by commit
fdab44f9e7 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
This commit is contained in:
Neil Fuller
2024-04-10 19:10:14 +01:00
committed by Android Build Coastguard Worker
parent ca5ff1a5e0
commit 2a339992d3
2 changed files with 12 additions and 0 deletions

View File

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

View File

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