diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2013-05-13 21:11:32 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-05-13 21:11:32 +0000 |
| commit | 28d3dbf969c4c7965ea44bfe4b54095af5356970 (patch) | |
| tree | e42c1f18903c3a9ae912320ea8c243a9ebe64858 | |
| parent | 98f9956d2a2f0f86f49ce244991e2ba3c38b95a0 (diff) | |
| parent | aee3d28763230e54d9ce250c17744858e79bf798 (diff) | |
| download | frameworks_base-28d3dbf969c4c7965ea44bfe4b54095af5356970.zip frameworks_base-28d3dbf969c4c7965ea44bfe4b54095af5356970.tar.gz frameworks_base-28d3dbf969c4c7965ea44bfe4b54095af5356970.tar.bz2 | |
Merge "Remove wifi scan-always dialog." into jb-mr2-dev
| -rw-r--r-- | core/java/android/provider/Settings.java | 8 | ||||
| -rw-r--r-- | wifi/java/android/net/wifi/WifiManager.java | 9 |
2 files changed, 0 insertions, 17 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 38fb51b..2725f6a 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. diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java index a7a5924..ec76a8b 100644 --- a/wifi/java/android/net/wifi/WifiManager.java +++ b/wifi/java/android/net/wifi/WifiManager.java @@ -408,15 +408,6 @@ public class WifiManager { "android.net.wifi.action.REQUEST_SCAN_ALWAYS_AVAILABLE"; /** - * Activity Action: Show a system activity that notifies the user that - * scanning is still available when Wi-Fi is turned off - * @hide - */ - @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) - public static final String ACTION_NOTIFY_SCAN_ALWAYS_AVAILABLE = - "android.net.wifi.action.NOTIFY_SCAN_ALWAYS_AVAILABLE"; - - /** * Activity Action: Pick a Wi-Fi network to connect to. * <p>Input: Nothing. * <p>Output: Nothing. |