summaryrefslogtreecommitdiffstats
path: root/wifi
diff options
context:
space:
mode:
authorRobert Greenwalt <rgreenwalt@google.com>2013-05-13 21:11:32 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-05-13 21:11:32 +0000
commit28d3dbf969c4c7965ea44bfe4b54095af5356970 (patch)
treee42c1f18903c3a9ae912320ea8c243a9ebe64858 /wifi
parent98f9956d2a2f0f86f49ce244991e2ba3c38b95a0 (diff)
parentaee3d28763230e54d9ce250c17744858e79bf798 (diff)
downloadframeworks_base-28d3dbf969c4c7965ea44bfe4b54095af5356970.zip
frameworks_base-28d3dbf969c4c7965ea44bfe4b54095af5356970.tar.gz
frameworks_base-28d3dbf969c4c7965ea44bfe4b54095af5356970.tar.bz2
Merge "Remove wifi scan-always dialog." into jb-mr2-dev
Diffstat (limited to 'wifi')
-rw-r--r--wifi/java/android/net/wifi/WifiManager.java9
1 files changed, 0 insertions, 9 deletions
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.