summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2013-02-15 00:02:17 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-02-15 00:02:17 +0000
commit07aef1c78a92e70552f269b37615c19aea042410 (patch)
tree6d3a9d34180224b843c350509b7777fbfbd930f2 /core
parent7ee9f636284584affa54b9735ccf157375b1c065 (diff)
parentead9389fd2e3e325cbe5bf9bdd896dd7c9113540 (diff)
downloadframeworks_base-07aef1c78a92e70552f269b37615c19aea042410.zip
frameworks_base-07aef1c78a92e70552f269b37615c19aea042410.tar.gz
frameworks_base-07aef1c78a92e70552f269b37615c19aea042410.tar.bz2
Merge "Remove throttle settings, no longer needed."
Diffstat (limited to 'core')
-rw-r--r--core/java/android/provider/Settings.java51
1 files changed, 0 insertions, 51 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 25954b9..8715349 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -2671,13 +2671,6 @@ public final class Settings {
MOVED_TO_GLOBAL.add(Settings.Global.TETHER_DUN_APN);
MOVED_TO_GLOBAL.add(Settings.Global.TETHER_DUN_REQUIRED);
MOVED_TO_GLOBAL.add(Settings.Global.TETHER_SUPPORTED);
- MOVED_TO_GLOBAL.add(Settings.Global.THROTTLE_HELP_URI);
- MOVED_TO_GLOBAL.add(Settings.Global.THROTTLE_MAX_NTP_CACHE_AGE_SEC);
- MOVED_TO_GLOBAL.add(Settings.Global.THROTTLE_NOTIFICATION_TYPE);
- MOVED_TO_GLOBAL.add(Settings.Global.THROTTLE_POLLING_SEC);
- MOVED_TO_GLOBAL.add(Settings.Global.THROTTLE_RESET_DAY);
- MOVED_TO_GLOBAL.add(Settings.Global.THROTTLE_THRESHOLD_BYTES);
- MOVED_TO_GLOBAL.add(Settings.Global.THROTTLE_VALUE_KBITSPS);
MOVED_TO_GLOBAL.add(Settings.Global.USB_MASS_STORAGE_ENABLED);
MOVED_TO_GLOBAL.add(Settings.Global.USE_GOOGLE_MAIL);
MOVED_TO_GLOBAL.add(Settings.Global.WEB_AUTOFILL_QUERY_URL);
@@ -4706,50 +4699,6 @@ public final class Settings {
public static final String TETHER_DUN_APN = "tether_dun_apn";
/**
- * The bandwidth throttle polling freqency in seconds
- * @hide
- */
- public static final String THROTTLE_POLLING_SEC = "throttle_polling_sec";
-
- /**
- * The bandwidth throttle threshold (long)
- * @hide
- */
- public static final String THROTTLE_THRESHOLD_BYTES = "throttle_threshold_bytes";
-
- /**
- * The bandwidth throttle value (kbps)
- * @hide
- */
- public static final String THROTTLE_VALUE_KBITSPS = "throttle_value_kbitsps";
-
- /**
- * The bandwidth throttle reset calendar day (1-28)
- * @hide
- */
- public static final String THROTTLE_RESET_DAY = "throttle_reset_day";
-
- /**
- * The throttling notifications we should send
- * @hide
- */
- public static final String THROTTLE_NOTIFICATION_TYPE = "throttle_notification_type";
-
- /**
- * Help URI for data throttling policy
- * @hide
- */
- public static final String THROTTLE_HELP_URI = "throttle_help_uri";
-
- /**
- * The length of time in Sec that we allow our notion of NTP time
- * to be cached before we refresh it
- * @hide
- */
- public static final String THROTTLE_MAX_NTP_CACHE_AGE_SEC =
- "throttle_max_ntp_cache_age_sec";
-
- /**
* USB Mass Storage Enabled
*/
public static final String USB_MASS_STORAGE_ENABLED = "usb_mass_storage_enabled";