diff options
| author | 2020-07-01 19:31:18 +0000 | |
|---|---|---|
| committer | 2020-07-01 19:31:18 +0000 | |
| commit | e29d6a62856e68db62f6dbb30f03f62d5a4d0975 (patch) | |
| tree | 19e359ad06aa29fdced6b292c92f7721d5ddb4ee | |
| parent | b9379f26d39a15e87739660f06fe82829b136636 (diff) | |
| parent | ad5d879455aeae4a1348fe10bc8e03dab5fef9a5 (diff) | |
Merge "[iwlan] config for connection persistence support" am: ad5d879455
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1350663
Change-Id: Iddae67f19e16a6698441550eb296219133bc85eb
| -rw-r--r-- | core/res/res/values/config.xml | 5 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index ad1f1f005baa..3d73ade33d5b 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 b0ee810fee41..ece65ff21487 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" /> |