diff options
| author | Amit Mahajan <amitmahajan@google.com> | 2015-09-10 01:53:09 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-10 01:53:09 +0000 |
| commit | 3ced622b8ad1d1d2ec463f708b07098abbfd306a (patch) | |
| tree | ffea6142056c75c11e53b2022e48714c89e357ea | |
| parent | 02cb344927cabaebf63b79f3ca89ed40f396a6b9 (diff) | |
| parent | 212230db28047e49b83b427ed6b6e541ecc198ea (diff) | |
| download | android_packages_services_Telephony-3ced622b8ad1d1d2ec463f708b07098abbfd306a.tar.gz android_packages_services_Telephony-3ced622b8ad1d1d2ec463f708b07098abbfd306a.tar.bz2 android_packages_services_Telephony-3ced622b8ad1d1d2ec463f708b07098abbfd306a.zip | |
am 212230db: am 9cb15f3f: am a858c453: am c7a37005: Merge "Add to hide preferred network type" into mnc-dr-dev
* commit '212230db28047e49b83b427ed6b6e541ecc198ea':
Add to hide preferred network type
| -rw-r--r-- | src/com/android/phone/MobileNetworkSettings.java | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/src/com/android/phone/MobileNetworkSettings.java b/src/com/android/phone/MobileNetworkSettings.java index 1c65089dc..7f0d2b77f 100644 --- a/src/com/android/phone/MobileNetworkSettings.java +++ b/src/com/android/phone/MobileNetworkSettings.java @@ -551,6 +551,23 @@ public class MobileNetworkSettings extends PreferenceActivity prefSet.removePreference(mButtonPreferredNetworkMode); prefSet.removePreference(mButtonEnabledNetworks); prefSet.removePreference(mLteDataServicePref); + } else if (carrierConfig.getBoolean(CarrierConfigManager + .KEY_HIDE_PREFERRED_NETWORK_TYPE_BOOL)) { + prefSet.removePreference(mButtonPreferredNetworkMode); + prefSet.removePreference(mButtonEnabledNetworks); + + final int phoneType = mPhone.getPhoneType(); + if (phoneType == PhoneConstants.PHONE_TYPE_CDMA) { + mCdmaOptions = new CdmaOptions(this, prefSet, mPhone); + // In World mode force a refresh of GSM Options. + if (isWorldMode()) { + mGsmUmtsOptions = null; + } + } else if (phoneType == PhoneConstants.PHONE_TYPE_GSM) { + mGsmUmtsOptions = new GsmUmtsOptions(this, prefSet, phoneSubId); + } else { + throw new IllegalStateException("Unexpected phone type: " + phoneType); + } } else if (carrierConfig.getBoolean(CarrierConfigManager.KEY_WORLD_PHONE_BOOL) == true) { prefSet.removePreference(mButtonEnabledNetworks); // set the listener for the mButtonPreferredNetworkMode list preference so we can issue |