diff options
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/settings/DeviceInfoSettings.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/DeviceInfoSettings.java index 1f0cad1..3a0e061 100644 --- a/src/com/android/settings/DeviceInfoSettings.java +++ b/src/com/android/settings/DeviceInfoSettings.java @@ -180,9 +180,10 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In removePreferenceIfBoolFalse(KEY_UPDATE_SETTING, R.bool.config_additional_system_update_setting_enable); - // Remove regulatory information if none present. + // Remove regulatory information if none present or config_show_regulatory_info is disabled final Intent intent = new Intent(Settings.ACTION_SHOW_REGULATORY_INFO); - if (getPackageManager().queryIntentActivities(intent, 0).isEmpty()) { + if (getPackageManager().queryIntentActivities(intent, 0).isEmpty() + || !getResources().getBoolean(R.bool.config_show_regulatory_info)) { Preference pref = findPreference(KEY_REGULATORY_INFO); if (pref != null) { getPreferenceScreen().removePreference(pref); |