From 34f0631ec18975803f6e2afee3e993e66b37fb53 Mon Sep 17 00:00:00 2001
From: Rebecca Silberstein <silberst@google.com>
Date: Wed, 30 May 2018 09:06:58 -0700
Subject: [PATCH] WifiManager: add call to see if apband conversion is required

Add call @hide allowing settings to check if the device requires softap
configs be converted from 5GHz only to ANY

Bug: 80251951
Test: frameworks/base/wifi/tests/runtests.sh
Change-Id: Id4d435eb55e2696d23ceb4d301e5d039e134d66a
---
 core/res/res/values/config.xml               |  4 ++++
 core/res/res/values/symbols.xml              |  1 +
 wifi/java/android/net/wifi/IWifiManager.aidl |  2 ++
 wifi/java/android/net/wifi/WifiManager.java  | 13 +++++++++++++
 4 files changed, 20 insertions(+)

diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index c856ed81d5758..3e26311abfc18 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -517,6 +517,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>
 
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index faf9093c0fe99..f80abc1a04f90 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -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" />
diff --git a/wifi/java/android/net/wifi/IWifiManager.aidl b/wifi/java/android/net/wifi/IWifiManager.aidl
index a7fffca8e4ef1..66ccc6cdfbfbd 100644
--- a/wifi/java/android/net/wifi/IWifiManager.aidl
+++ b/wifi/java/android/net/wifi/IWifiManager.aidl
@@ -107,6 +107,8 @@ interface IWifiManager
 
     boolean isDualBandSupported();
 
+    boolean needs5GHzToAnyApBandConversion();
+
     DhcpInfo getDhcpInfo();
 
     boolean isScanAlwaysAvailable();
diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java
index a19965d24c3e9..25f35d0523a2c 100644
--- a/wifi/java/android/net/wifi/WifiManager.java
+++ b/wifi/java/android/net/wifi/WifiManager.java
@@ -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.