From 8fd9afd76fd45b9e4bb01c3014b5ece0189a46ed Mon Sep 17 00:00:00 2001 From: Danesh M Date: Wed, 17 Feb 2016 11:48:48 -0800 Subject: Revert "Customize regulatory info." This reverts commit 3d299959deb33a86ba2925eb4fa954e0118bd893. This breaks on the dialer shotcode to access this (*#07#) CYNGNOS-2050 Change-Id: Ia02512642307b25e9ff7e8c0533da5eaa7233a7f --- src/com/android/settings/DeviceInfoSettings.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/com') 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); -- cgit v1.1