am 3f511882: Merge "Check location permission/appop in getScanResults" into mnc-dev

* commit '3f51188294a910c8985c778c7d86a909e6cbee25':
  Check location permission/appop in getScanResults
This commit is contained in:
Fyodor Kupolov
2015-07-09 17:26:09 +00:00
committed by Android Git Automerger

View File

@@ -1276,7 +1276,10 @@ public class WifiManager {
/**
* Return the results of the latest access point scan.
* @return the list of access points found in the most recent scan.
* @return the list of access points found in the most recent scan. An app must hold
* {@link android.Manifest.permission#ACCESS_COARSE_LOCATION ACCESS_COARSE_LOCATION} or
* {@link android.Manifest.permission#ACCESS_COARSE_LOCATION ACCESS_FINE_LOCATION} permission
* in order to get valid results.
*/
public List<ScanResult> getScanResults() {
try {