PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix time zone settings restriction logic

Browse Source 
- Time zone should be restricted when "no_config_date_time" enabled

Bug: 316584466
Change-Id: I90dfc2c84ef0b2155740c7b890f17376c9e57e51
Test: manual via TestDPC
This commit is contained in:
Edgar Wang
2024-01-11 11:18:45 +00:00
parent 59d67c3dc2
commit d0fcba932c
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/datetime/TimeZonePreferenceController.java
View File

@@ -26,6 +26,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 com.android.settingslib.datetime.ZoneGetter; import com.android.settingslib.datetime.ZoneGetter;
import java.util.Calendar; import java.util.Calendar;
@@ -52,6 +53,12 @@ public class TimeZonePreferenceController 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(shouldEnableManualTimeZoneSelection()); preference.setEnabled(shouldEnableManualTimeZoneSelection());
} }