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

Commit 3eda32cc authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic 'fast-bss-transition' into nyc-mr2-dev 

* changes:
  Add capability flag for 802.11r fast BSS transition
  Add constants for 802.11r
parents c977c776 fbb63b09

core/res/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -419,6 +419,9 @@ 
    <!-- Boolean indicating whether Hotspot 2.0/Passpoint and ANQP queries is enabled -->

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



    <!-- Boolean indicating whether 802.11r Fast BSS Transition is enabled on this platform -->

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



    <!-- Device type information conforming to Annex B format in WiFi Direct specification.

         The default represents a dual-mode smartphone -->

    <string translatable="false" name="config_wifi_p2p_device_type">10-0050F204-5</string>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -1699,6 +1699,7 @@ 
  <java-symbol type="bool" name="config_wifi_background_scan_support" />

  <java-symbol type="bool" name="config_wifi_dual_band_support" />

  <java-symbol type="bool" name="config_wifi_hotspot2_enabled" />

  <java-symbol type="bool" name="config_wifi_fast_bss_transition_enabled" />

  <java-symbol type="bool" name="config_wimaxEnabled" />

  <java-symbol type="bool" name="show_ongoing_ime_switcher" />

  <java-symbol type="color" name="config_defaultNotificationColor" />

wifi/java/android/net/wifi/WifiConfiguration.java

+13 −1
Original line number Diff line number Diff line
@@ -98,10 +98,22 @@ public class WifiConfiguration implements Parcelable { 
         */

        public static final int OSEN = 5;



        /**

         * IEEE 802.11r Fast BSS Transition with PSK authentication.

         * @hide

         */

        public static final int FT_PSK = 6;



        /**

         * IEEE 802.11r Fast BSS Transition with EAP authentication.

         * @hide

         */

        public static final int FT_EAP = 7;



        public static final String varName = "key_mgmt";



        public static final String[] strings = { "NONE", "WPA_PSK", "WPA_EAP", "IEEE8021X",

                "WPA2_PSK", "OSEN" };

                "WPA2_PSK", "OSEN", "FT_PSK", "FT_EAP" };

    }



    /**