diff options
| author | 2024-06-18 10:29:05 +0000 | |
|---|---|---|
| committer | 2024-06-20 20:05:44 +0900 | |
| commit | 6f7f5902a2844bd0ad4915c0f68a81a53872a03a (patch) | |
| tree | 36d52a8daf52ff4df86c67878e55158059adca90 /service/ServiceWifiResources | |
| parent | 7fef8e5345b2717f50eac1404d9604d0c78b9234 (diff) | |
Add overlay allowlist for P2P/NAN concurrency
Add an overlay allowlist of packages that can use P2P/NAN concurrency.
If a non-allowlisted app tries to request P2P when NAN is up (or vice
versa), then pretend P2P/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: 329363672
Test: atest HalDeviceManagerTest
Change-Id: I3618f12cab8ace5ed11681fee02eba6a2fbc35a8
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 ab73f3ac90..f85af51b18 100644 --- a/service/ServiceWifiResources/res/values/config.xml +++ b/service/ServiceWifiResources/res/values/config.xml @@ -1099,6 +1099,14 @@ it as low priority when disconnected, allowing it to be deleted to create other interfaces. A negative value disables this behavior. --> <integer translatable="false" name="config_disconnectedP2pIfaceLowPriorityTimeoutMs">-1</integer> + <!-- list of package names that the framework will allow to use P2P/Aware concurrency. If this + list is empty, then all packages are allowed --> + <string-array translatable="false" name="config_wifiP2pAwareConcurrencyAllowlist"> + <!-- 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 e736668dd1..3b8333a1c7 100644 --- a/service/ServiceWifiResources/res/values/overlayable.xml +++ b/service/ServiceWifiResources/res/values/overlayable.xml @@ -305,6 +305,7 @@ <item type="array" name="config_wifiExcludedFromUserApprovalForD2dInterfacePriority" /> <item type="bool" name="config_wifiUserApprovalNotRequireForDisconnectedP2p" /> <item type="integer" name="config_disconnectedP2pIfaceLowPriorityTimeoutMs" /> + <item type="array" name="config_wifiP2pAwareConcurrencyAllowlist" /> <item type="bool" name="config_wifiNetworkCentricQosPolicyFeatureEnabled" /> <item type="bool" name="config_wifiApplicationCentricQosPolicyFeatureEnabled" /> <item type="string" name="config_wifiDriverWorldModeCountryCode" /> |