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

Commit 4e9e3d02 authored by Paul Stewart's avatar Paul Stewart Committed by Android Partner Code Review
Browse files

Merge "WifiManager: Return empty scan list on remote exception" into mm-wireless-dev

parents 3d4acbf5 ed929799

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

+5 −2
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ import com.android.internal.util.AsyncChannel; 
import com.android.internal.util.Protocol;



import java.net.InetAddress;

import java.util.ArrayList;

import java.util.List;

import java.util.concurrent.CountDownLatch;
@@ -1311,13 +1312,15 @@ public class WifiManager { 
     * @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_FINE_LOCATION ACCESS_FINE_LOCATION} permission

     * in order to get valid results.

     * in order to get valid results.  If there is a remote exception (e.g., either a communication

     * problem with the system service or an exception within the framework) an empty list will be

     * returned.

     */

    public List<ScanResult> getScanResults() {

        try {

            return mService.getScanResults(mContext.getOpPackageName());

        } catch (RemoteException e) {

            return null;

            return new ArrayList<ScanResult>();

        }

    }