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

Merge "Check location permission/appop in getScanResults" into mnc-dev

Browse Source
This commit is contained in:
Fyodor Kupolov
2015-07-09 17:14:14 +00:00
committed by Android (Google) Code Review
parent b091695bd9 cb13aebfec
commit 3f51188294
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1276,7 +1276,10 @@ public class WifiManager {
/** /**
* Return the results of the latest access point scan. * 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() { public List<ScanResult> getScanResults() {
try { try {