diff options
| author | Etan Cohen <etancohen@google.com> | 2014-09-04 22:33:18 -0700 |
|---|---|---|
| committer | Etan Cohen <etancohen@google.com> | 2014-09-06 02:30:12 +0000 |
| commit | fdd41b3cbfc16a19c5a16ec9bd56cdd76e179fcf (patch) | |
| tree | 0b217ddfccf9e88dbefe778b9b50743cc3216e30 | |
| parent | f7efe33da234c834dff0292dc6aceed26388ccfa (diff) | |
| download | frameworks_base-fdd41b3cbfc16a19c5a16ec9bd56cdd76e179fcf.zip frameworks_base-fdd41b3cbfc16a19c5a16ec9bd56cdd76e179fcf.tar.gz frameworks_base-fdd41b3cbfc16a19c5a16ec9bd56cdd76e179fcf.tar.bz2 | |
Modified VoLTE configuration: separate device and carrier configs.
Default device and carrier disabled.
Device to be overlayed in device/<xxx> dirs.
Carrier overlayed in this project.
Bug: 17365969
Change-Id: I95d58e934fc85506287069ddd71af4a5b7594bfb
| -rw-r--r-- | core/res/res/values-mcc310-mnc260/config.xml | 5 | ||||
| -rw-r--r-- | core/res/res/values-mcc311-mnc480/config.xml | 4 | ||||
| -rw-r--r-- | core/res/res/values/config.xml | 7 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 3 |
4 files changed, 14 insertions, 5 deletions
diff --git a/core/res/res/values-mcc310-mnc260/config.xml b/core/res/res/values-mcc310-mnc260/config.xml index 2f9394a..f8fff3b 100644 --- a/core/res/res/values-mcc310-mnc260/config.xml +++ b/core/res/res/values-mcc310-mnc260/config.xml @@ -25,6 +25,11 @@ --> <integer name="config_mobile_mtu">1440</integer> + <!-- Flag specifying whether VoLTE & VT should be available for carrier: independent of + carrier provisioning. If false: hard disabled. If true: then depends on carrier + provisioning, availability etc --> + <bool name="config_carrier_volte_vt_available">true</bool> + <!-- Values for GPS configuration (T-Mobile) --> <string-array translatable="false" name="config_gpsParameters"> <item>CAPABILITEIS=0x33</item> diff --git a/core/res/res/values-mcc311-mnc480/config.xml b/core/res/res/values-mcc311-mnc480/config.xml index cd5d55b..57ecd31 100644 --- a/core/res/res/values-mcc311-mnc480/config.xml +++ b/core/res/res/values-mcc311-mnc480/config.xml @@ -38,10 +38,10 @@ be disabled) but individual Features can be disabled using ImsConfig.setFeatureValue() --> <bool name="imsServiceAllowTurnOff">false</bool> - <!-- Flag specifying whether VoLTE & VT should be allowed on device: independent of the + <!-- Flag specifying whether VoLTE & VT should be available for carrier: independent of carrier provisioning. If false: hard disabled. If true: then depends on carrier provisioning, availability etc --> - <bool name="config_mobile_allow_volte_vt">false</bool> + <bool name="config_carrier_volte_vt_available">false</bool> <bool name="config_auto_attach_data_on_creation">false</bool> diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 6b1f69d..f3b3077 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -1674,10 +1674,13 @@ be disabled) but individual Features can be disabled using ImsConfig.setFeatureValue() --> <bool name="imsServiceAllowTurnOff">true</bool> - <!-- Flag specifying whether VoLTE & VT should be allowed on device: independent of the + <!-- Flag specifying whether VoLTE & VT is availasble on device --> + <bool name="config_device_volte_vt_available">false</bool> + + <!-- Flag specifying whether VoLTE & VT should be available for carrier: independent of carrier provisioning. If false: hard disabled. If true: then depends on carrier provisioning, availability etc --> - <bool name="config_mobile_allow_volte_vt">true</bool> + <bool name="config_carrier_volte_vt_available">false</bool> <bool name="config_networkSamplingWakesDevice">true</bool> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 95486e0..01e6e76 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -1970,7 +1970,8 @@ <java-symbol type="attr" name="preferenceFragmentStyle" /> <java-symbol type="bool" name="skipHoldBeforeMerge" /> <java-symbol type="bool" name="imsServiceAllowTurnOff" /> - <java-symbol type="bool" name="config_mobile_allow_volte_vt" /> + <java-symbol type="bool" name="config_device_volte_vt_available" /> + <java-symbol type="bool" name="config_carrier_volte_vt_available" /> <java-symbol type="bool" name="useImsAlwaysForEmergencyCall" /> <java-symbol type="attr" name="touchscreenBlocksFocus" /> <java-symbol type="layout" name="resolver_list_with_default" /> |