summaryrefslogtreecommitdiffstats
path: root/core/java/android/provider
diff options
context:
space:
mode:
authorJunda Liu <junda@google.com>2015-07-23 16:20:35 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-07-23 16:20:35 +0000
commit859551f7c0acdc8fa9f9d5ffaf0efc69441d5e47 (patch)
tree884f4f6888c9a962a3ee54fb07d8a66937196951 /core/java/android/provider
parent7f9e9012f4bbcdd880e16212be9d90b50607c74d (diff)
parentd5f0f4132c4779aa946023ee48d001d70db7ac12 (diff)
downloadframeworks_base-859551f7c0acdc8fa9f9d5ffaf0efc69441d5e47.zip
frameworks_base-859551f7c0acdc8fa9f9d5ffaf0efc69441d5e47.tar.gz
frameworks_base-859551f7c0acdc8fa9f9d5ffaf0efc69441d5e47.tar.bz2
Merge "Remove volte_feature_disabled as carrier config handled it." into mnc-dev
Diffstat (limited to 'core/java/android/provider')
-rw-r--r--core/java/android/provider/Settings.java8
1 files changed, 0 insertions, 8 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index fff355b..a79970c 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -7578,14 +7578,6 @@ public final class Settings {
public static final String WFC_IMS_ROAMING_ENABLED = "wfc_ims_roaming_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>