diff options
author | vandwalle <vandwalle@google.com> | 2014-11-26 20:02:35 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-26 20:02:35 +0000 |
commit | f12fc2e14ebcf14745de03963a621e36bda11232 (patch) | |
tree | d788b6e85d27cfcfcd67b9e49b7904cf47fddce8 /wifi/java/android/net | |
parent | 06e8c58e7cf84b87613f4c8114ec75db58e32d72 (diff) | |
parent | b6c9cbc57694fb7fbd903fa08d42a55bc729114d (diff) | |
download | frameworks_base-f12fc2e14ebcf14745de03963a621e36bda11232.zip frameworks_base-f12fc2e14ebcf14745de03963a621e36bda11232.tar.gz frameworks_base-f12fc2e14ebcf14745de03963a621e36bda11232.tar.bz2 |
am b6c9cbc5: am 47772ac8: Merge "make startScan with worksource specific to location scans" into lmp-mr1-dev
* commit 'b6c9cbc57694fb7fbd903fa08d42a55bc729114d':
make startScan with worksource specific to location scans
Diffstat (limited to 'wifi/java/android/net')
-rw-r--r-- | wifi/java/android/net/wifi/IWifiManager.aidl | 2 | ||||
-rw-r--r-- | wifi/java/android/net/wifi/WifiManager.java | 16 |
2 files changed, 18 insertions, 0 deletions
diff --git a/wifi/java/android/net/wifi/IWifiManager.aidl b/wifi/java/android/net/wifi/IWifiManager.aidl index a752686..5ee17bb 100644 --- a/wifi/java/android/net/wifi/IWifiManager.aidl +++ b/wifi/java/android/net/wifi/IWifiManager.aidl @@ -61,6 +61,8 @@ interface IWifiManager void startScan(in ScanSettings requested, in WorkSource ws); + void startLocationRestrictedScan(in WorkSource ws); + List<ScanResult> getScanResults(String callingPackage); void disconnect(); diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java index 6ddebde..d19952c 100644 --- a/wifi/java/android/net/wifi/WifiManager.java +++ b/wifi/java/android/net/wifi/WifiManager.java @@ -1011,6 +1011,22 @@ public class WifiManager { } /** + * startLocationRestrictedScan() + * Trigger a scan which will not make use of DFS channels and is thus not suitable for + * establishing wifi connection. + * @hide + */ + @SystemApi + public boolean startLocationRestrictedScan(WorkSource workSource) { + try { + mService.startLocationRestrictedScan(workSource); + return true; + } catch (RemoteException e) { + return false; + } + } + + /** * Request a scan for access points in specified channel list. Each channel is specified by its * frequency in MHz, e.g. "5500" (do NOT include "DFS" even though it is). The availability of * the results is made known later in the same way as {@link #startScan}. |