summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJake Hamby <jhamby@google.com>2012-08-20 18:06:25 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-08-20 18:06:25 -0700
commit0de311b4956acc6ec05d25707f1075c1b8a38280 (patch)
treee8a21b0288c2568e0c8f2e533bb5e6feb886ea30
parent71742eb13276e93d18f6aead10a8f767134ab0af (diff)
parentc46455ac7a2ad988700f975bb07558c8580bbe8e (diff)
downloadpackages_apps_Settings-0de311b4956acc6ec05d25707f1075c1b8a38280.zip
packages_apps_Settings-0de311b4956acc6ec05d25707f1075c1b8a38280.tar.gz
packages_apps_Settings-0de311b4956acc6ec05d25707f1075c1b8a38280.tar.bz2
am c46455ac: Merge "Enable "APN roaming protocol" for all platforms"
* commit 'c46455ac7a2ad988700f975bb07558c8580bbe8e': Enable "APN roaming protocol" for all platforms
-rw-r--r--src/com/android/settings/ApnEditor.java10
1 files changed, 1 insertions, 9 deletions
diff --git a/src/com/android/settings/ApnEditor.java b/src/com/android/settings/ApnEditor.java
index bca521b..79b6d15 100644
--- a/src/com/android/settings/ApnEditor.java
+++ b/src/com/android/settings/ApnEditor.java
@@ -167,15 +167,7 @@ public class ApnEditor extends PreferenceActivity
mProtocol.setOnPreferenceChangeListener(this);
mRoamingProtocol = (ListPreference) findPreference(KEY_ROAMING_PROTOCOL);
- // Only enable this on CDMA phones for now, since it may cause problems on other phone
- // types. (This screen is not normally accessible on CDMA phones, but is useful for
- // testing.)
- TelephonyManager tm = (TelephonyManager)getSystemService(TELEPHONY_SERVICE);
- if (tm.getCurrentPhoneType() == PhoneConstants.PHONE_TYPE_CDMA) {
- mRoamingProtocol.setOnPreferenceChangeListener(this);
- } else {
- getPreferenceScreen().removePreference(mRoamingProtocol);
- }
+ mRoamingProtocol.setOnPreferenceChangeListener(this);
mCarrierEnabled = (CheckBoxPreference) findPreference(KEY_CARRIER_ENABLED);