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

Commit 12eef9f1 authored by Mitchell Wills's avatar Mitchell Wills Committed by android-build-merger
Browse files

Updates for gscan HAL updates in N 

am: c90855d7

* commit 'c90855d7':
  Updates for gscan HAL updates in N
parents 5a5877d5 c90855d7

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -25949,6 +25949,7 @@ package android.net.wifi { 
    field public static final int REASON_UNSPECIFIED = -1; // 0xffffffff

    field public static final deprecated int REPORT_EVENT_AFTER_BUFFER_FULL = 0; // 0x0

    field public static final int REPORT_EVENT_AFTER_EACH_SCAN = 1; // 0x1

    field public static final int REPORT_EVENT_CONTEXT_HUB = 8; // 0x8

    field public static final int REPORT_EVENT_FULL_SCAN_RESULT = 2; // 0x2

    field public static final int REPORT_EVENT_NO_BATCH = 4; // 0x4

    field public static final int WIFI_BAND_24_GHZ = 1; // 0x1

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

+19 −7
Original line number Diff line number Diff line
@@ -136,17 +136,29 @@ public class WifiScanner { 
        }

    }



    /** reports {@link ScanListener#onResults} when underlying buffers are full

    /**

     * reports {@link ScanListener#onResults} when underlying buffers are full

     * this is simply the lack of the {@link #REPORT_EVENT_AFTER_EACH_SCAN} flag

     * @deprecated

     */

    @Deprecated

    public static final int REPORT_EVENT_AFTER_BUFFER_FULL = 0;

    /** reports {@link ScanListener#onResults} after each scan */

    public static final int REPORT_EVENT_AFTER_EACH_SCAN = 1;

    /** reports {@link ScanListener#onFullResult} whenever each beacon is discovered */

    public static final int REPORT_EVENT_FULL_SCAN_RESULT = 2;

    /** do not batch */

    public static final int REPORT_EVENT_NO_BATCH = 4;

    /**

     * reports {@link ScanListener#onResults} after each scan

     */

    public static final int REPORT_EVENT_AFTER_EACH_SCAN = (1 << 0);

    /**

     * reports {@link ScanListener#onFullResult} whenever each beacon is discovered

     */

    public static final int REPORT_EVENT_FULL_SCAN_RESULT = (1 << 1);

    /**

     * Do not place scans in the chip's scan history buffer

     */

    public static final int REPORT_EVENT_NO_BATCH = (1 << 2);

    /**

     * report full scan results and completion event to the context hub

     */

    public static final int REPORT_EVENT_CONTEXT_HUB = (1 << 3);



    /**

     * scan configuration parameters to be sent to {@link #startBackgroundScan}