Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 47772ac8: Merge "make startScan with worksource specific to location scans" into lmp-mr1-dev

Browse Source 
* commit '47772ac8e969fae53f8a3cef9066843fe20cae70':
  make startScan with worksource specific to location scans
This commit is contained in:
vandwalle
2014-11-26 19:41:36 +00:00
committed by Android Git Automerger
parent cd5d46ff81 47772ac8e9
commit b6c9cbc576
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wifi/java/android/net/wifi/IWifiManager.aidl
View File

@@ -61,6 +61,8 @@ interface IWifiManager
void startScan(in ScanSettings requested, in WorkSource ws); void startScan(in ScanSettings requested, in WorkSource ws);
void startLocationRestrictedScan(in WorkSource ws);
List<ScanResult> getScanResults(String callingPackage); List<ScanResult> getScanResults(String callingPackage);
void disconnect(); void disconnect();

16
wifi/java/android/net/wifi/WifiManager.java
View File

@@ -1010,6 +1010,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 * 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 * frequency in MHz, e.g. "5500" (do NOT include "DFS" even though it is). The availability of