summaryrefslogtreecommitdiffstats
path: root/wifi/java/android/net
diff options
context:
space:
mode:
authorIrfan Sheriff <isheriff@google.com>2010-08-17 16:48:36 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-08-17 16:48:36 -0700
commita1af0d7c80a0119630926810644e6cdee481ba80 (patch)
tree90dff8dc87fddd6a079b0c6823b6e845ef0bfd4d /wifi/java/android/net
parentf996ed9f2e4a992e5d884077a15dcc23a8d90c44 (diff)
parent4d32d81bd7abb77ab9663f4f800bd96dca0c0e03 (diff)
downloadframeworks_base-a1af0d7c80a0119630926810644e6cdee481ba80.zip
frameworks_base-a1af0d7c80a0119630926810644e6cdee481ba80.tar.gz
frameworks_base-a1af0d7c80a0119630926810644e6cdee481ba80.tar.bz2
Merge "Fix SDK build" into gingerbread
Diffstat (limited to 'wifi/java/android/net')
-rw-r--r--wifi/java/android/net/wifi/WifiManager.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java
index 3b41dc1..9d21521 100644
--- a/wifi/java/android/net/wifi/WifiManager.java
+++ b/wifi/java/android/net/wifi/WifiManager.java
@@ -1004,8 +1004,8 @@ public class WifiManager {
* Creates a new WifiLock.
*
* @param lockType the type of lock to create. See {@link #WIFI_MODE_FULL},
- * {@link #WIFI_MODE_SCAN_ONLY} and {@link #WIFI_MODE_FULL_HIGH_PERF} for descriptions
- * of the types of Wi-Fi locks.
+ * and {@link #WIFI_MODE_SCAN_ONLY} for descriptions of the types of Wi-Fi locks.
+ *
* @param tag a tag for the WifiLock to identify it in debugging messages. This string is
* never shown to the user under normal conditions, but should be descriptive
* enough to identify your application and the specific WifiLock within it, if it