diff options
| -rwxr-xr-x | AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | src/com/android/settings/DeviceInfoSettings.java | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 908661f..b798452 100755 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -2592,7 +2592,7 @@ <activity android:name="RegulatoryInfoDisplayActivity" android:label="@string/regulatory_information" android:taskAffinity="" - android:enabled="true"> + android:enabled="@bool/config_show_regulatory_info"> <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 3b255f0..949eaab 100644 --- a/src/com/android/settings/DeviceInfoSettings.java +++ b/src/com/android/settings/DeviceInfoSettings.java @@ -209,10 +209,9 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In // Remove manual entry if none present. removePreferenceIfBoolFalse(KEY_MANUAL, R.bool.config_show_manual); - // Remove regulatory information if none present or config_show_regulatory_info is disabled + // Remove regulatory information if none present final Intent intent = new Intent(Settings.ACTION_SHOW_REGULATORY_INFO); - if (getPackageManager().queryIntentActivities(intent, 0).isEmpty() - || !getResources().getBoolean(R.bool.config_show_regulatory_info)) { + if (getPackageManager().queryIntentActivities(intent, 0).isEmpty()) { Preference pref = findPreference(KEY_REGULATORY_INFO); if (pref != null) { getPreferenceScreen().removePreference(pref); |