diff options
| author | Irfan Sheriff <isheriff@google.com> | 2013-03-20 15:49:20 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-03-20 15:49:20 +0000 |
| commit | 63f1e2fb6b7102490b11523589b82c2101d3c079 (patch) | |
| tree | 06e6d2b718a882043cef77cbd29ca32431d16c19 /api/current.txt | |
| parent | ec3928bf0993e13fb82c65ac26a4d70f5bc6c5e4 (diff) | |
| parent | 1ef840cdc785d0e8a07e317cc1d7af42a0d0185d (diff) | |
| download | frameworks_base-63f1e2fb6b7102490b11523589b82c2101d3c079.zip frameworks_base-63f1e2fb6b7102490b11523589b82c2101d3c079.tar.gz frameworks_base-63f1e2fb6b7102490b11523589b82c2101d3c079.tar.bz2 | |
Merge "Add API to control scan always mode" into jb-mr2-dev
Diffstat (limited to 'api/current.txt')
| -rw-r--r-- | api/current.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index e89dc22..ad2a623 100644 --- a/api/current.txt +++ b/api/current.txt @@ -13582,6 +13582,7 @@ package android.net.wifi { method public deprecated android.net.DhcpInfo getDhcpInfo(); method public java.util.List<android.net.wifi.ScanResult> getScanResults(); method public int getWifiState(); + method public boolean isScanningAlwaysAvailable(); method public boolean isWifiEnabled(); method public boolean pingSupplicant(); method public boolean reassociate(); @@ -13592,6 +13593,7 @@ package android.net.wifi { method public boolean startScan(); method public int updateNetwork(android.net.wifi.WifiConfiguration); field public static final java.lang.String ACTION_PICK_WIFI_NETWORK = "android.net.wifi.PICK_WIFI_NETWORK"; + field public static final java.lang.String ACTION_REQUEST_SCAN_ALWAYS_AVAILABLE = "android.net.wifi.action.REQUEST_SCAN_ALWAYS_AVAILABLE"; field public static final int ERROR_AUTHENTICATING = 1; // 0x1 field public static final java.lang.String EXTRA_BSSID = "bssid"; field public static final java.lang.String EXTRA_NETWORK_INFO = "networkInfo"; |