Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 711fb234 authored by Fyodor Kupolov's avatar Fyodor Kupolov Committed by Android Git Automerger
Browse files

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

* commit '9d650f15':
  Check location permission/appop in getScanResults
parents 8d6620bd 9d650f15

wifi/java/android/net/wifi/WifiManager.java

+4 −1
Original line number Original line Diff line number Diff line
@@ -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 {