Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 02fc087d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[iwlan] config for connection persistence support" am: ad5d8794 am:... 

Merge "[iwlan] config for connection persistence support" am: ad5d8794 am: e29d6a62 am: 5a48285b

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

Change-Id: I0f52a6b9398a4d921c09b7e524b122f295efb689
parents a362eaf8 5a48285b

core/res/res/values/config.xml

+5 −0
Original line number Diff line number Diff line
@@ -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>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -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" />