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

Commit b14e1fdb authored by Rebecca Silberstein's avatar Rebecca Silberstein Committed by android-build-merger
Browse files

Merge "WifiManager: add call to see if apband conversion is required" into pi-dev 

am: 85bdd711

Change-Id: I4f2c8e9ebcfd4bb92cad23f222218960188ca09b
parents c28267da 85bdd711

core/res/res/values/config.xml

+4 −0
Original line number Diff line number Diff line
@@ -519,6 +519,10 @@ 
    <!-- 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 the wifi chipset requires the softap band be -->

    <!-- converted from 5GHz to ANY due to hardware restrictions -->

    <bool translatable="false" name="config_wifi_convert_apband_5ghz_to_any">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

+1 −0
Original line number Diff line number Diff line
@@ -1867,6 +1867,7 @@ 
  <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_convert_apband_5ghz_to_any" />

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

wifi/java/android/net/wifi/IWifiManager.aidl

+2 −0
Original line number Diff line number Diff line
@@ -107,6 +107,8 @@ interface IWifiManager 


    boolean isDualBandSupported();



    boolean needs5GHzToAnyApBandConversion();



    DhcpInfo getDhcpInfo();



    boolean isScanAlwaysAvailable();

wifi/java/android/net/wifi/WifiManager.java

+13 −0
Original line number Diff line number Diff line
@@ -1762,6 +1762,19 @@ public class WifiManager { 
        }

    }



    /**

     * Check if the chipset requires conversion of 5GHz Only apBand to ANY.

     * @return {@code true} if required, {@code false} otherwise.

     * @hide

     */

    public boolean isDualModeSupported() {

        try {

            return mService.needs5GHzToAnyApBandConversion();

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    /**

     * Return the DHCP-assigned addresses from the last successful DHCP request,

     * if any.