diff options
| author | Danesh M <daneshm90@gmail.com> | 2016-02-17 11:48:48 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2016-02-23 14:27:14 -0800 |
| commit | 8fd9afd76fd45b9e4bb01c3014b5ece0189a46ed (patch) | |
| tree | f52fa1ca31c2c664a3e305e6ebc7a62d85a01fa0 /src/com | |
| parent | 0fdfdea6fa433475eaab26a95b9df7b5d1612d00 (diff) | |
| download | packages_apps_Settings-8fd9afd76fd45b9e4bb01c3014b5ece0189a46ed.zip packages_apps_Settings-8fd9afd76fd45b9e4bb01c3014b5ece0189a46ed.tar.gz packages_apps_Settings-8fd9afd76fd45b9e4bb01c3014b5ece0189a46ed.tar.bz2 | |
Revert "Customize regulatory info."
This reverts commit 3d299959deb33a86ba2925eb4fa954e0118bd893.
This breaks on the dialer shotcode to access this (*#07#)
CYNGNOS-2050
Change-Id: Ia02512642307b25e9ff7e8c0533da5eaa7233a7f
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/settings/DeviceInfoSettings.java | 5 |
1 files changed, 2 insertions, 3 deletions
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); |