diff options
author | 2024-11-14 15:08:52 +0900 | |
---|---|---|
committer | 2024-11-14 15:08:52 +0900 | |
commit | 7d3fc37d9454d1d93c08af028f438a6c6c787413 (patch) | |
tree | 5ac9975ba577a02237e0db71741632a68a945cd8 /service/ServiceWifiResources | |
parent | 791976156514c58385d7dc352cedfad55ea1de7e (diff) |
Add overlay allowlist for AP/NAN concurrency
Add an overlay allowlist of packages that can use AP/NAN concurrency.
If a non-allowlisted app tries to request AP (or Bridged AP) when NAN
is up (or viceversa), then pretend AP/NAN concurrency isn't supported
and force an interface conflict decision (reject request, delete
existing, or show the ICM dialog).
Updated-Overlayable: TRUE
Flag: EXEMPT gated by overlay
Bug: 365865790
Test: atest HalDeviceManagerTest
Change-Id: Icb56a1b1850aeb7d67e62ab3de7ae71a64d2b14d
Diffstat (limited to 'service/ServiceWifiResources')
-rw-r--r-- | service/ServiceWifiResources/res/values/config.xml | 8 | ||||
-rw-r--r-- | service/ServiceWifiResources/res/values/overlayable.xml | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/service/ServiceWifiResources/res/values/config.xml b/service/ServiceWifiResources/res/values/config.xml index c6068b0ab9..da98aa9694 100644 --- a/service/ServiceWifiResources/res/values/config.xml +++ b/service/ServiceWifiResources/res/values/config.xml @@ -1114,6 +1114,14 @@ <item>com.company2.example.test.name2</item> --> </string-array> + <!-- list of package names that the framework will allow to use SoftAp/Aware concurrency. If + this list is empty, then all packages are allowed --> + <string-array translatable="false" name="config_wifiSoftApAwareConcurrencyAllowlist"> + <!-- Below is a sample configuration for this list: + <item>com.company1.example.test.name1</item> + <item>com.company2.example.test.name2</item> + --> + </string-array> <!-- boolean indicating whether the Easy Connect (DPP) AKM is supported --> <bool translatable="false" name ="config_wifiDppAkmSupported">false</bool> <!-- Indicates the number of octets to mask for each BSSID in the SecurityLog output. diff --git a/service/ServiceWifiResources/res/values/overlayable.xml b/service/ServiceWifiResources/res/values/overlayable.xml index 7409ad1414..1c0c6a348d 100644 --- a/service/ServiceWifiResources/res/values/overlayable.xml +++ b/service/ServiceWifiResources/res/values/overlayable.xml @@ -308,6 +308,7 @@ <item type="bool" name="config_wifiUserApprovalNotRequireForDisconnectedP2p" /> <item type="integer" name="config_disconnectedP2pIfaceLowPriorityTimeoutMs" /> <item type="array" name="config_wifiP2pAwareConcurrencyAllowlist" /> + <item type="array" name="config_wifiSoftApAwareConcurrencyAllowlist" /> <item type="bool" name="config_wifiNetworkCentricQosPolicyFeatureEnabled" /> <item type="bool" name="config_wifiApplicationCentricQosPolicyFeatureEnabled" /> <item type="string" name="config_wifiDriverWorldModeCountryCode" /> |