diff options
| -rw-r--r-- | AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | src/com/android/settings/DeviceInfoSettings.java | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index cc78228..7923033 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -2429,7 +2429,7 @@ <activity android:name="RegulatoryInfoDisplayActivity" android:label="@string/regulatory_information" android:taskAffinity="" - android:enabled="@bool/config_show_regulatory_info"> + android:enabled="true"> <intent-filter> <action android:name="android.settings.SHOW_REGULATORY_INFO" /> <category android:name="android.intent.category.DEFAULT" /> 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); |