From ed39184bef370b26b780b3f1f97ffa7a676604a2 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
Merged-In: If328b6e1467095e059e532f55e0062211b7c80c9
Change-Id: If328b6e1467095e059e532f55e0062211b7c80c9
(cherry picked from commit 846b17a1ad7b29386a0ea45c8ffad29e2c9108f0)
---
 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 ad1f1f005baaa..3d73ade33d5bd 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -3064,6 +3064,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 b0ee810fee417..ece65ff214871 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -298,6 +298,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" />