diff options
| author | Fyodor Kupolov <fkupolov@google.com> | 2015-07-09 17:14:14 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-09 17:14:19 +0000 |
| commit | 3f51188294a910c8985c778c7d86a909e6cbee25 (patch) | |
| tree | 677b30a3c9b149f3eb1aaf50fc50c9e801426f4a /wifi/java/android/net | |
| parent | b091695bd9b9a87fc637751cfa2b52c8b72ce487 (diff) | |
| parent | cb13aebfec313a3433ed0f53cc2e3b6dbaf888d0 (diff) | |
| download | frameworks_base-3f51188294a910c8985c778c7d86a909e6cbee25.zip frameworks_base-3f51188294a910c8985c778c7d86a909e6cbee25.tar.gz frameworks_base-3f51188294a910c8985c778c7d86a909e6cbee25.tar.bz2 | |
Merge "Check location permission/appop in getScanResults" into mnc-dev
Diffstat (limited to 'wifi/java/android/net')
| -rw-r--r-- | wifi/java/android/net/wifi/WifiManager.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java index d00c654..e5a1d02 100644 --- a/wifi/java/android/net/wifi/WifiManager.java +++ b/wifi/java/android/net/wifi/WifiManager.java @@ -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 { |