Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Separate VoLTE and VT configurations to enable devices/carriers to have VoLTE without VT." into lmp-mr1-dev

Browse Source
This commit is contained in:
Pavel Zhamaitsiak
2014-10-23 20:24:11 +00:00
committed by Android (Google) Code Review
parent 9016ecab3b e41a9cf9f7
commit c8a09d5434
6 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/provider/Settings.java
View File

@@ -6599,7 +6599,7 @@ public final class Settings {
* Type: int (0 for false, 1 for true) * Type: int (0 for false, 1 for true)
* @hide * @hide
*/ */
public static final String VOLTE_VT_ENABLED = "volte_vt_enabled"; public static final String ENHANCED_4G_MODE_ENABLED = "volte_vt_enabled";
/** /**
* Settings to backup. This is here so that it's in the same place as the settings * Settings to backup. This is here so that it's in the same place as the settings

4
core/res/res/values-mcc310-mnc260/config.xml
View File

@@ -25,8 +25,8 @@
--> -->
<integer name="config_mobile_mtu">1440</integer> <integer name="config_mobile_mtu">1440</integer>
<!-- Flag specifying whether VoLTE & VT should be available for carrier: independent of <!-- Flag specifying whether VoLTE should be available for carrier: independent of
carrier provisioning. If false: hard disabled. If true: then depends on carrier carrier provisioning. If false: hard disabled. If true: then depends on carrier
provisioning, availability etc --> provisioning, availability etc -->
<bool name="config_carrier_volte_vt_available">true</bool> <bool name="config_carrier_volte_available">true</bool>
</resources> </resources>

4
core/res/res/values-mcc311-mnc480/config.xml
View File

@@ -38,10 +38,10 @@
be disabled) but individual Features can be disabled using ImsConfig.setFeatureValue() --> be disabled) but individual Features can be disabled using ImsConfig.setFeatureValue() -->
<bool name="imsServiceAllowTurnOff">false</bool> <bool name="imsServiceAllowTurnOff">false</bool>
<!-- Flag specifying whether VoLTE & VT should be available for carrier: independent of <!-- Flag specifying whether VoLTE should be available for carrier: independent of
carrier provisioning. If false: hard disabled. If true: then depends on carrier carrier provisioning. If false: hard disabled. If true: then depends on carrier
provisioning, availability etc --> provisioning, availability etc -->
<bool name="config_carrier_volte_vt_available">true</bool> <bool name="config_carrier_volte_available">true</bool>
<bool name="config_auto_attach_data_on_creation">false</bool> <bool name="config_auto_attach_data_on_creation">false</bool>
<!-- service number convert map in roaming network. --> <!-- service number convert map in roaming network. -->

16
core/res/res/values/config.xml
View File

@@ -1787,13 +1787,21 @@
be disabled) but individual Features can be disabled using ImsConfig.setFeatureValue() --> be disabled) but individual Features can be disabled using ImsConfig.setFeatureValue() -->
<bool name="imsServiceAllowTurnOff">true</bool> <bool name="imsServiceAllowTurnOff">true</bool>
<!-- Flag specifying whether VoLTE & VT is availasble on device --> <!-- Flag specifying whether VoLTE is available on device -->
<bool name="config_device_volte_vt_available">false</bool> <bool name="config_device_volte_available">false</bool>
<!-- Flag specifying whether VoLTE & VT should be available for carrier: independent of <!-- Flag specifying whether VoLTE should be available for carrier: independent of
carrier provisioning. If false: hard disabled. If true: then depends on carrier carrier provisioning. If false: hard disabled. If true: then depends on carrier
provisioning, availability etc --> provisioning, availability etc -->
<bool name="config_carrier_volte_vt_available">false</bool> <bool name="config_carrier_volte_available">false</bool>
<!-- Flag specifying whether VT is available on device -->
<bool name="config_device_vt_available">false</bool>
<!-- Flag specifying whether 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_vt_available">false</bool>
<bool name="config_networkSamplingWakesDevice">true</bool> <bool name="config_networkSamplingWakesDevice">true</bool>

6
core/res/res/values/symbols.xml
View File

@@ -2040,8 +2040,10 @@
<java-symbol type="attr" name="preferenceFragmentStyle" /> <java-symbol type="attr" name="preferenceFragmentStyle" />
<java-symbol type="bool" name="skipHoldBeforeMerge" /> <java-symbol type="bool" name="skipHoldBeforeMerge" />
<java-symbol type="bool" name="imsServiceAllowTurnOff" /> <java-symbol type="bool" name="imsServiceAllowTurnOff" />
<java-symbol type="bool" name="config_device_volte_vt_available" /> <java-symbol type="bool" name="config_device_volte_available" />
<java-symbol type="bool" name="config_carrier_volte_vt_available" /> <java-symbol type="bool" name="config_carrier_volte_available" />
<java-symbol type="bool" name="config_device_vt_available" />
<java-symbol type="bool" name="config_carrier_vt_available" />
<java-symbol type="bool" name="useImsAlwaysForEmergencyCall" /> <java-symbol type="bool" name="useImsAlwaysForEmergencyCall" />
<java-symbol type="attr" name="touchscreenBlocksFocus" /> <java-symbol type="attr" name="touchscreenBlocksFocus" />
<java-symbol type="layout" name="resolver_list_with_default" /> <java-symbol type="layout" name="resolver_list_with_default" />

4
packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
View File

@@ -1855,7 +1855,7 @@ public class DatabaseHelper extends SQLiteOpenHelper {
try { try {
stmt = db.compileStatement("INSERT OR IGNORE INTO global(name,value)" stmt = db.compileStatement("INSERT OR IGNORE INTO global(name,value)"
+ " VALUES(?,?);"); + " VALUES(?,?);");
loadSetting(stmt, Settings.Global.VOLTE_VT_ENABLED, ImsConfig.FeatureValueConstants.ON); loadSetting(stmt, Settings.Global.ENHANCED_4G_MODE_ENABLED, ImsConfig.FeatureValueConstants.ON);
db.setTransactionSuccessful(); db.setTransactionSuccessful();
} finally { } finally {
db.endTransaction(); db.endTransaction();
@@ -2610,7 +2610,7 @@ public class DatabaseHelper extends SQLiteOpenHelper {
loadBooleanSetting(stmt, Settings.Global.GUEST_USER_ENABLED, loadBooleanSetting(stmt, Settings.Global.GUEST_USER_ENABLED,
R.bool.def_guest_user_enabled); R.bool.def_guest_user_enabled);
loadSetting(stmt, Settings.Global.VOLTE_VT_ENABLED, ImsConfig.FeatureValueConstants.ON); loadSetting(stmt, Settings.Global.ENHANCED_4G_MODE_ENABLED, ImsConfig.FeatureValueConstants.ON);
// --- New global settings start here // --- New global settings start here
} finally { } finally {
if (stmt != null) stmt.close(); if (stmt != null) stmt.close();