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

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

Merge "Add system feature flag FEATURE_WIFI_PASSPOINT"

parents 2bd8bdc8 b99fe31d

core/java/android/content/pm/PackageManager.java

+8 −0
Original line number Diff line number Diff line
@@ -2270,6 +2270,14 @@ public abstract class PackageManager { 
    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_WIFI_AWARE = "android.hardware.wifi.aware";



    /**

     * Feature for {@link #getSystemAvailableFeatures} and

     * {@link #hasSystemFeature}: The device supports Wi-Fi Passpoint.

     * @hide

     */

    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_WIFI_PASSPOINT = "android.hardware.wifi.passpoint";



    /**

     * Feature for {@link #getSystemAvailableFeatures} and

     * {@link #hasSystemFeature}: This is a device dedicated to showing UI

core/res/res/values/config.xml

+0 −3
Original line number Diff line number Diff line
@@ -425,9 +425,6 @@ 
    <!-- Boolean indicating whether the wifi chipset has dual frequency band support -->

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



    <!-- 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>

core/res/res/values/symbols.xml

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

  <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" />