From 6f7f5902a2844bd0ad4915c0f68a81a53872a03a Mon Sep 17 00:00:00 2001
From: Quang Luong <qal@google.com>
Date: Tue, 18 Jun 2024 10:29:05 +0000
Subject: 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
---
 service/ServiceWifiResources/res/values/config.xml      | 8 ++++++++
 service/ServiceWifiResources/res/values/overlayable.xml | 1 +
 2 files changed, 9 insertions(+)

(limited to 'service/ServiceWifiResources')

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" />
-- 
cgit v1.2.3-59-g8ed1b