diff options
| author | Jeff Brown <jeffbrown@google.com> | 2012-09-25 17:02:26 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-25 17:03:11 -0700 |
| commit | b32e221699201cb647beae3fe0a1771fd5a41cf4 (patch) | |
| tree | 54d5f76a31728976ba75e590c077cefc1448ac82 /api | |
| parent | 0a52088e58a6ddea0966ba9cd2fbc7bd3e23809a (diff) | |
| parent | bf6f6f9de72c9fd15e6bda9f228c05a9b37d6324 (diff) | |
| download | frameworks_base-b32e221699201cb647beae3fe0a1771fd5a41cf4.zip frameworks_base-b32e221699201cb647beae3fe0a1771fd5a41cf4.tar.gz frameworks_base-b32e221699201cb647beae3fe0a1771fd5a41cf4.tar.bz2 | |
Merge changes I332f020f,I632648ac into jb-mr1-dev
* changes:
Update references to migrated global settings.
Handle user switched for settings changes.
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt index f8329f2..c732c3e 100644 --- a/api/current.txt +++ b/api/current.txt @@ -18907,7 +18907,7 @@ package android.provider { field public static final deprecated java.lang.String USB_MASS_STORAGE_ENABLED = "usb_mass_storage_enabled"; field public static final deprecated java.lang.String USE_GOOGLE_MAIL = "use_google_mail"; field public static final deprecated 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 deprecated java.lang.String WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MS = "wifi_mobile_data_transition_wakelock_timeout_ms"; 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"; |