From cb13aebfec313a3433ed0f53cc2e3b6dbaf888d0 Mon Sep 17 00:00:00 2001 From: Fyodor Kupolov Date: Fri, 19 Jun 2015 15:54:12 -0700 Subject: Check location permission/appop in getScanResults Return an empty list if the calling process has no location permission/appop Bug: 21852542 Change-Id: Ifb9c5eb06c3fc7136a7f8251ac152234585f5b67 --- wifi/java/android/net/wifi/WifiManager.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'wifi/java/android/net/wifi/WifiManager.java') 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 getScanResults() { try { -- cgit v1.1