diff options
| author | Arne Coucheron <arco68@gmail.com> | 2015-11-17 06:43:16 +0100 |
|---|---|---|
| committer | Ethan Chen <intervigil@gmail.com> | 2015-11-21 22:18:50 -0800 |
| commit | 48a85e4b7e872c9b0bb0bd4545b1dc33f47685e6 (patch) | |
| tree | 88321a30f3c1f27fc840882a09fac1941e210366 /telephony/java | |
| parent | 42f4f2f2ff4278ca8411504617f55a712562c242 (diff) | |
| download | frameworks_base-48a85e4b7e872c9b0bb0bd4545b1dc33f47685e6.zip frameworks_base-48a85e4b7e872c9b0bb0bd4545b1dc33f47685e6.tar.gz frameworks_base-48a85e4b7e872c9b0bb0bd4545b1dc33f47685e6.tar.bz2 | |
Revert "Telephony: Enable few key carrierConfig param."
This reverts commit 70134eacb72c3450c9fd4ed2aa8b8d9db835ca7a.
Change-Id: I92139a898161f482cf829ca97f5ac088c3539d18
Diffstat (limited to 'telephony/java')
| -rw-r--r-- | telephony/java/android/telephony/CarrierConfigManager.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 94bf4eb..aa4da4b 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -502,7 +502,7 @@ public class CarrierConfigManager { sDefaults.putBoolean(KEY_OPERATOR_SELECTION_EXPAND_BOOL, true); sDefaults.putBoolean(KEY_PREFER_2G_BOOL, true); sDefaults.putBoolean(KEY_SHOW_APN_SETTING_CDMA_BOOL, false); - sDefaults.putBoolean(KEY_SHOW_CDMA_CHOICES_BOOL, true); + sDefaults.putBoolean(KEY_SHOW_CDMA_CHOICES_BOOL, false); sDefaults.putBoolean(KEY_SHOW_ONSCREEN_DIAL_BUTTON_BOOL, true); sDefaults.putBoolean(KEY_SIM_NETWORK_UNLOCK_ALLOW_DISMISS_BOOL, true); sDefaults.putBoolean(KEY_SUPPORT_PAUSE_IMS_VIDEO_CALLS_BOOL, true); @@ -511,7 +511,7 @@ public class CarrierConfigManager { sDefaults.putBoolean(KEY_USE_OTASP_FOR_PROVISIONING_BOOL, false); sDefaults.putBoolean(KEY_VOICEMAIL_NOTIFICATION_PERSISTENT_BOOL, false); sDefaults.putBoolean(KEY_VOICE_PRIVACY_DISABLE_UI_BOOL, false); - sDefaults.putBoolean(KEY_WORLD_PHONE_BOOL, true); + sDefaults.putBoolean(KEY_WORLD_PHONE_BOOL, false); sDefaults.putBoolean(KEY_REQUIRE_ENTITLEMENT_CHECKS_BOOL, true); sDefaults.putInt(KEY_VOLTE_REPLACEMENT_RAT_INT, 0); sDefaults.putString(KEY_DEFAULT_SIM_CALL_MANAGER_STRING, ""); |