Merge "[iwlan] config for connection persistence support" am: ad5d879455 am: e29d6a6285

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1350663

Change-Id: I43c9234268d17bfaa870ef9a7774a727970541f8
This commit is contained in:
Treehugger Robot
2020-07-01 19:55:17 +00:00
committed by Automerger Merge Worker
2 changed files with 6 additions and 0 deletions

View File

@@ -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>

View File

@@ -302,6 +302,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" />