diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-10-12 04:20:24 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-10-12 04:20:24 -0700 |
| commit | bcf069ed68d2c8350498b6c9e664bfb7dc0daf76 (patch) | |
| tree | 4da7bab5dbe1c4deb8ec05087ec7d77ad4358b06 /src/com/android | |
| parent | b17d7c45fc19ef4c694dd8df999d41a5ce49052c (diff) | |
| parent | 3d299959deb33a86ba2925eb4fa954e0118bd893 (diff) | |
| download | packages_apps_Settings-bcf069ed68d2c8350498b6c9e664bfb7dc0daf76.zip packages_apps_Settings-bcf069ed68d2c8350498b6c9e664bfb7dc0daf76.tar.gz packages_apps_Settings-bcf069ed68d2c8350498b6c9e664bfb7dc0daf76.tar.bz2 | |
Merge "Customize regulatory info."
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); |