From a39c14c08e0ca68818713192ae07cf198454899b Mon Sep 17 00:00:00 2001 From: Neil Fuller Date: Wed, 10 Apr 2024 19:10:14 +0100 Subject: [PATCH] Restore enterprise policy checks Restore enterprise policy checks removed by commit fdab44f9e71f78a0c2809c03a8dd654c7dd3dd70 and not since restored by other changes. Bug: 325886855 Bug: 316584466 Bug: 235445309 Test: Treehugger only Change-Id: Id3d79805bb2289b84ad34ac05a97e50f0410502f (cherry picked from commit 5d80553a155524e73713348fc11b9f98bee0308b) --- .../android/settings/datetime/DatePreferenceController.java | 6 ++++++ .../android/settings/datetime/TimePreferenceController.java | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/src/com/android/settings/datetime/DatePreferenceController.java b/src/com/android/settings/datetime/DatePreferenceController.java index 02aba6efc6a..f9e3b8f29b7 100644 --- a/src/com/android/settings/datetime/DatePreferenceController.java +++ b/src/com/android/settings/datetime/DatePreferenceController.java @@ -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()); } diff --git a/src/com/android/settings/datetime/TimePreferenceController.java b/src/com/android/settings/datetime/TimePreferenceController.java index 1923d55a72c..f0a69ea6886 100644 --- a/src/com/android/settings/datetime/TimePreferenceController.java +++ b/src/com/android/settings/datetime/TimePreferenceController.java @@ -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()); }