summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorEtan Cohen <etancohen@google.com>2014-12-03 20:43:46 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-03 20:43:46 +0000
commita2ab707c87b8129873078dcea8effdd970de67c3 (patch)
tree684a895926e23f51316d3c486a269f815741f208 /core
parent62a7022f7d831c166d7ffd198556df4a7f106510 (diff)
parent89b55fc52d0ad20013353af32e7d4823d95db575 (diff)
downloadframeworks_base-a2ab707c87b8129873078dcea8effdd970de67c3.zip
frameworks_base-a2ab707c87b8129873078dcea8effdd970de67c3.tar.gz
frameworks_base-a2ab707c87b8129873078dcea8effdd970de67c3.tar.bz2
am 89b55fc5: am 7ab0ad1f: Add a global override for VoLTE calls (which leaves user setting in place)
* commit '89b55fc52d0ad20013353af32e7d4823d95db575': Add a global override for VoLTE calls (which leaves user setting in place)
Diffstat (limited to 'core')
-rw-r--r--core/java/android/provider/Settings.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 5e5fbc7..0c036d51 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -6608,6 +6608,14 @@ public final class Settings {
public static final String ENHANCED_4G_MODE_ENABLED = "volte_vt_enabled";
/**
+ * Global override to disable VoLTE (independent of user setting)
+ * <p>
+ * Type: int (1 for disable VoLTE, 0 to use user configuration)
+ * @hide
+ */
+ public static final String VOLTE_FEATURE_DISABLED = "volte_feature_disabled";
+
+ /**
* Whether user can enable/disable LTE as a preferred network. A carrier might control
* this via gservices, OMA-DM, carrier app, etc.
* <p>