From 846b17a1ad7b29386a0ea45c8ffad29e2c9108f0 Mon Sep 17 00:00:00 2001
From: Chinmay Dhodapkar <chinmayd@google.com>
Date: Fri, 19 Jun 2020 16:13:30 -0700
Subject: [PATCH] [iwlan] config for connection persistence support

Not all implementation of Iwlan data service can support
persistence of iwlan tunnel across service crash/restart

A new config, config_wlan_data_service_conn_persistence_on_restart,
is added to handle this case.
This new config allows data service to declare support for ipsec
tunnel persistence across service restart. Telephony framework can
take action to clean up dangling connections in case service restarts
and if this flag is set to 'false'

Default value is 'true' [i.e no change from existing behavior]

Bug: 158043105
Tests: on device test involving killing/restart of data service
Change-Id: If328b6e1467095e059e532f55e0062211b7c80c9
---
 core/res/res/values/config.xml  | 5 +++++
 core/res/res/values/symbols.xml | 1 +
 2 files changed, 6 insertions(+)

diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 9f4b9b34856e6..20c53a7982fd8 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -2905,6 +2905,11 @@
          empty string is passed in -->
     <string name="config_wlan_data_service_package" translatable="false"></string>
 
+    <!-- Boolean indicating whether the Iwlan data service supports persistence of iwlan ipsec
+         tunnels across service restart. If iwlan tunnels are not persisted across restart,
+         Framework will clean up dangling data connections when service restarts -->
+    <bool name="config_wlan_data_service_conn_persistence_on_restart">true</bool>
+
     <!-- Cellular data service class name to bind to by default. If none is specified in an overlay, an
          empty string is passed in -->
     <string name="config_wwan_data_service_class" translatable="false"></string>
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index ad3e09d75c5bf..e297f3abb1261 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -303,6 +303,7 @@
   <java-symbol type="string" name="config_wlan_network_service_package" />
   <java-symbol type="string" name="config_wwan_network_service_class" />
   <java-symbol type="string" name="config_wlan_network_service_class" />
+  <java-symbol type="bool" name="config_wlan_data_service_conn_persistence_on_restart" />
   <java-symbol type="string" name="config_wwan_data_service_package" />
   <java-symbol type="string" name="config_wlan_data_service_package" />
   <java-symbol type="string" name="config_wwan_data_service_class" />