PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am c46455ac: Merge "Enable "APN roaming protocol" for all platforms"

Browse Source 
* commit 'c46455ac7a2ad988700f975bb07558c8580bbe8e':
  Enable "APN roaming protocol" for all platforms
This commit is contained in:
Jake Hamby
2012-08-20 18:06:25 -07:00
committed by Android Git Automerger
parent 71742eb132 c46455ac7a
commit 0de311b495
1 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/ApnEditor.java
View File

@@ -167,15 +167,7 @@ public class ApnEditor extends PreferenceActivity
mProtocol.setOnPreferenceChangeListener(this); mProtocol.setOnPreferenceChangeListener(this);
mRoamingProtocol = (ListPreference) findPreference(KEY_ROAMING_PROTOCOL); mRoamingProtocol = (ListPreference) findPreference(KEY_ROAMING_PROTOCOL);
// Only enable this on CDMA phones for now, since it may cause problems on other phone mRoamingProtocol.setOnPreferenceChangeListener(this);
// 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);
}
mCarrierEnabled = (CheckBoxPreference) findPreference(KEY_CARRIER_ENABLED); mCarrierEnabled = (CheckBoxPreference) findPreference(KEY_CARRIER_ENABLED);