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

Commit 3d25ec44 authored by Rebecca Silberstein's avatar Rebecca Silberstein Committed by android-build-merger
Browse files

Merge "WifiScanner: retrieve single scan results" am: 3c70a2fa am: c507bcaf am: 6d2cca0f 

am: 683bc64b

Change-Id: I39e4061c2afac1f841bb800b40d15f32d529f214
parents 9857953f 683bc64b

wifi/java/android/net/wifi/WifiScanner.java

+20 −1
Original line number Original line Diff line number Diff line
@@ -34,9 +34,10 @@ import com.android.internal.util.AsyncChannel; 
import com.android.internal.util.Preconditions;

import com.android.internal.util.Preconditions;

import com.android.internal.util.Protocol;

import com.android.internal.util.Protocol;





import java.util.ArrayList;

import java.util.Arrays;

import java.util.List;

import java.util.List;







/**

/**

 * This class provides a way to scan the Wifi universe around the device

 * This class provides a way to scan the Wifi universe around the device

 * Get an instance of this class by calling

 * Get an instance of this class by calling
@@ -822,6 +823,22 @@ public class WifiScanner { 
        mAsyncChannel.sendMessage(CMD_STOP_SINGLE_SCAN, 0, key);

        mAsyncChannel.sendMessage(CMD_STOP_SINGLE_SCAN, 0, key);

    }

    }





    /**

     * Retrieve the most recent scan results from a single scan request.

     * {@hide}

     */

    public List<ScanResult> getSingleScanResults() {

        validateChannel();

        Message reply = mAsyncChannel.sendMessageSynchronously(CMD_GET_SINGLE_SCAN_RESULTS, 0);

        if (reply.what == WifiScanner.CMD_OP_SUCCEEDED) {

            return Arrays.asList(((ParcelableScanResults) reply.obj).getResults());

        }

        OperationResult result = (OperationResult) reply.obj;

        Log.e(TAG, "Error retrieving SingleScan results reason: " + result.reason

                + " description: " + result.description);

        return new ArrayList<ScanResult>();

    }



    private void startPnoScan(ScanSettings scanSettings, PnoSettings pnoSettings, int key) {

    private void startPnoScan(ScanSettings scanSettings, PnoSettings pnoSettings, int key) {

        // Bundle up both the settings and send it across.

        // Bundle up both the settings and send it across.

        Bundle pnoParams = new Bundle();

        Bundle pnoParams = new Bundle();
@@ -1201,6 +1218,8 @@ public class WifiScanner { 
    public static final int CMD_REGISTER_SCAN_LISTENER      = BASE + 27;

    public static final int CMD_REGISTER_SCAN_LISTENER      = BASE + 27;

    /** @hide */

    /** @hide */

    public static final int CMD_DEREGISTER_SCAN_LISTENER    = BASE + 28;

    public static final int CMD_DEREGISTER_SCAN_LISTENER    = BASE + 28;

    /** @hide */

    public static final int CMD_GET_SINGLE_SCAN_RESULTS     = BASE + 29;





    private Context mContext;

    private Context mContext;

    private IWifiScanner mService;

    private IWifiScanner mService;