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

Commit 66143cac authored by Pierre Vandwalle's avatar Pierre Vandwalle Committed by Android Partner Code Review
Browse files

Merge "add disconnected scan parameter, add bytes[] container to scanResults" into m-wireless-dev

parents 3031bf96 127217a3

core/res/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -437,6 +437,9 @@ 
         point on the move. A value of 0 means no periodic scans will be used in the framework. -->

    <integer translatable="false" name="config_wifi_framework_scan_interval">300000</integer>



    <!-- Integer indicating disconnect mode scan interval in milliseconds -->

    <integer translatable="false" name="config_wifi_disconnected_scan_interval">15000</integer>



    <!-- Integer indicating associated partial scan interval in milliseconds -->

    <integer translatable="false" name="config_wifi_framework_associated_scan_interval">20000</integer>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -371,6 +371,7 @@ 
  <java-symbol type="integer" name="config_triplePressOnPowerBehavior" />

  <java-symbol type="integer" name="config_wifi_framework_scan_interval" />

  <java-symbol type="integer" name="config_wifi_supplicant_scan_interval" />

  <java-symbol type="integer" name="config_wifi_disconnected_scan_interval" />

  <java-symbol type="integer" name="config_wifi_scan_interval_p2p_connected" />

  <java-symbol type="integer" name="db_connection_pool_size" />

  <java-symbol type="integer" name="db_journal_size_limit" />

wifi/java/android/net/wifi/ScanResult.java

+6 −0
Original line number Diff line number Diff line
@@ -261,6 +261,12 @@ public class ScanResult implements Parcelable { 
        return freq > 4900 && freq < 5900;

    }



    /**

     *  @hide

     * storing the raw bytes of full result IEs

     **/

    public byte[] bytes;



    /** information element from beacon

     * @hide

     */