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

Commit a8c99cd8 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge changes from topic 'am-eb4443f078884e5f82b9ce2fd7dec764' 

* changes:
  Add capability flag for 802.11r fast BSS transition am: fbb63b09 am: 67e2694f
  Add constants for 802.11r am: 3ed7caa0 am: 7e6940d7
parents e9278712 f54ac12a

core/res/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -422,6 +422,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
@@ -1716,6 +1716,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" };

    }



    /**