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

Commit d10eb9c3 authored by Pierre Vandwalle's avatar Pierre Vandwalle Committed by Android (Google) Code Review
Browse files

Merge changes I847ec3a9,I201b5206 

* changes:
  add HAL PNO config parameter
  add disconnected scan parameter, add bytes[] container to scanResults
parents a8ac52d6 37f6b930

core/res/res/values/config.xml

+6 −0
Original line number Diff line number Diff line
@@ -423,6 +423,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>
@@ -472,6 +475,9 @@ 
    <!-- Wifi driver supports batched scan -->

    <bool translatable="false" name="config_wifi_batched_scan_supported">false</bool>



    <!-- Wifi HAL supported PNO -->

    <bool translatable="false" name="config_wifi_hal_pno_enable">false</bool>



    <!-- Idle Receive current for wifi radio. 0 by default-->

    <integer translatable="false" name="config_wifi_idle_receive_cur_ma">1</integer>

core/res/res/values/symbols.xml

+2 −0
Original line number Diff line number Diff line
@@ -378,7 +378,9 @@ 
  <java-symbol type="integer" name="config_shortPressOnSleepBehavior" />

  <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="bool" name="config_wifi_hal_pno_enable" />

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

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

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

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

     */