summaryrefslogtreecommitdiffstats
path: root/api/17.txt
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@google.com>2012-09-14 21:16:02 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-09-14 21:16:03 -0700
commitb3571a6ca8877181695ddbd916c2be73625e5a99 (patch)
tree3b6f2196977de5e9c3698797cfb50b2b2a131cfd /api/17.txt
parentedf60d3d0ab0b9e14c023ecf7aacf72c480dec24 (diff)
parent5f9c4c475fd25623406ccdaa1ac08e56631d4d22 (diff)
downloadframeworks_base-b3571a6ca8877181695ddbd916c2be73625e5a99.zip
frameworks_base-b3571a6ca8877181695ddbd916c2be73625e5a99.tar.gz
frameworks_base-b3571a6ca8877181695ddbd916c2be73625e5a99.tar.bz2
Merge "Fix build" into jb-mr1-dev
Diffstat (limited to 'api/17.txt')
-rw-r--r--api/17.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/api/17.txt b/api/17.txt
index e001159..cab0cf5 100644
--- a/api/17.txt
+++ b/api/17.txt
@@ -18415,10 +18415,10 @@ package android.provider {
field public static final java.lang.String USE_GOOGLE_MAIL = "use_google_mail";
field public static final java.lang.String WIFI_MAX_DHCP_RETRY_COUNT = "wifi_max_dhcp_retry_count";
field public static final java.lang.String WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MS = "wifi_mobile_data_transition_wakelock_timeout_ms";
- field public static final java.lang.String WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON = "wifi_networks_available_notification_on";
- field public static final java.lang.String WIFI_NETWORKS_AVAILABLE_REPEAT_DELAY = "wifi_networks_available_repeat_delay";
- field public static final java.lang.String WIFI_NUM_OPEN_NETWORKS_KEPT = "wifi_num_open_networks_kept";
- field public static final java.lang.String WIFI_ON = "wifi_on";
+ field public static final deprecated java.lang.String WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON = "wifi_networks_available_notification_on";
+ field public static final deprecated java.lang.String WIFI_NETWORKS_AVAILABLE_REPEAT_DELAY = "wifi_networks_available_repeat_delay";
+ field public static final deprecated java.lang.String WIFI_NUM_OPEN_NETWORKS_KEPT = "wifi_num_open_networks_kept";
+ field public static final deprecated java.lang.String WIFI_ON = "wifi_on";
field public static final deprecated java.lang.String WIFI_WATCHDOG_ACCEPTABLE_PACKET_LOSS_PERCENTAGE = "wifi_watchdog_acceptable_packet_loss_percentage";
field public static final deprecated java.lang.String WIFI_WATCHDOG_AP_COUNT = "wifi_watchdog_ap_count";
field public static final deprecated java.lang.String WIFI_WATCHDOG_BACKGROUND_CHECK_DELAY_MS = "wifi_watchdog_background_check_delay_ms";