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
Change-Id: Id3d79805bb2289b84ad34ac05a97e50f0410502f
This commit is contained in:
@@ -34,6 +34,7 @@ import androidx.annotation.VisibleForTesting;
|
|||||||
import androidx.preference.Preference;
|
import androidx.preference.Preference;
|
||||||
|
|
||||||
import com.android.settings.core.BasePreferenceController;
|
import com.android.settings.core.BasePreferenceController;
|
||||||
|
import com.android.settingslib.RestrictedPreference;
|
||||||
|
|
||||||
import java.util.Calendar;
|
import java.util.Calendar;
|
||||||
|
|
||||||
@@ -68,6 +69,11 @@ public class DatePreferenceController extends BasePreferenceController
|
|||||||
@Override
|
@Override
|
||||||
public void updateState(Preference preference) {
|
public void updateState(Preference preference) {
|
||||||
super.updateState(preference);
|
super.updateState(preference);
|
||||||
|
|
||||||
|
if (preference instanceof RestrictedPreference
|
||||||
|
&& ((RestrictedPreference) preference).isDisabledByAdmin()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
preference.setEnabled(isEnabled());
|
preference.setEnabled(isEnabled());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -32,6 +32,7 @@ import android.widget.TimePicker;
|
|||||||
import androidx.preference.Preference;
|
import androidx.preference.Preference;
|
||||||
|
|
||||||
import com.android.settings.core.BasePreferenceController;
|
import com.android.settings.core.BasePreferenceController;
|
||||||
|
import com.android.settingslib.RestrictedPreference;
|
||||||
|
|
||||||
import java.util.Calendar;
|
import java.util.Calendar;
|
||||||
|
|
||||||
@@ -66,6 +67,11 @@ public class TimePreferenceController extends BasePreferenceController
|
|||||||
@Override
|
@Override
|
||||||
public void updateState(Preference preference) {
|
public void updateState(Preference preference) {
|
||||||
super.updateState(preference);
|
super.updateState(preference);
|
||||||
|
|
||||||
|
if (preference instanceof RestrictedPreference
|
||||||
|
&& ((RestrictedPreference) preference).isDisabledByAdmin()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
preference.setEnabled(isEnabled());
|
preference.setEnabled(isEnabled());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user