diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2013-05-13 14:13:50 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-13 14:13:50 -0700 |
| commit | 23abefef00b4d47bb97b2597f74c9dae6a169286 (patch) | |
| tree | 650d891d246f79f6dce9570fa1fed3cdfa5a38ce /core/java/android | |
| parent | 0038342d7cd5ef796444fd29fef9eac5b6576fcb (diff) | |
| parent | 28d3dbf969c4c7965ea44bfe4b54095af5356970 (diff) | |
am 28d3dbf9: Merge "Remove wifi scan-always dialog." into jb-mr2-dev
* commit '28d3dbf969c4c7965ea44bfe4b54095af5356970':
Remove wifi scan-always dialog.
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/provider/Settings.java | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 38fb51bc43e9..2725f6ae9dda 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -4842,14 +4842,6 @@ public final class Settings { "wifi_scan_always_enabled"; /** - * Setting to indicate whether the user should be notified that scans are still - * available when Wi-Fi is turned off - * @hide - */ - public static final String WIFI_NOTIFY_SCAN_ALWAYS_AVAILABLE = - "wifi_notify_scan_always_enabled"; - - /** * Used to save the Wifi_ON state prior to tethering. * This state will be checked to restore Wifi after * the user turns off tethering. |