summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorEtan Cohen <etancohen@google.com>2014-12-03 21:51:00 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-03 21:51:00 +0000
commit64d3c1402aa6abfc9772e8c93a7f0a5b9a9c6c9d (patch)
tree32b6c64093ed07b8a2eb8dd6e9373889b3efcca3 /core/java
parent07b2b9f45dc235f5d94321df25acc7134cf05216 (diff)
parenta2ab707c87b8129873078dcea8effdd970de67c3 (diff)
downloadframeworks_base-64d3c1402aa6abfc9772e8c93a7f0a5b9a9c6c9d.zip
frameworks_base-64d3c1402aa6abfc9772e8c93a7f0a5b9a9c6c9d.tar.gz
frameworks_base-64d3c1402aa6abfc9772e8c93a7f0a5b9a9c6c9d.tar.bz2
am a2ab707c: am 89b55fc5: am 7ab0ad1f: Add a global override for VoLTE calls (which leaves user setting in place)
* commit 'a2ab707c87b8129873078dcea8effdd970de67c3': Add a global override for VoLTE calls (which leaves user setting in place)
Diffstat (limited to 'core/java')
-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 345a5b1..886d684 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>