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

Commit e0675d84 authored by Sal Savage's avatar Sal Savage Committed by android-build-merger
Browse files

Merge "Update config file documentation and examples for network type... 

Merge "Update config file documentation and examples for network type propagation" am: bfd44b60 am: a414bf16
am: 948ba47e

Change-Id: I19f3eda783e1d58ab5070e882181fe8be3c9514b
parents 90a0a466 948ba47e

core/res/res/values/config.xml

+6 −1
Original line number Original line Diff line number Diff line
@@ -381,7 +381,7 @@ 








    <!-- Configuration of Ethernet interfaces in the following format:

    <!-- Configuration of Ethernet interfaces in the following format:

         <interface name|mac address>;[Network Capabilities];[IP config]

         <interface name|mac address>;[Network Capabilities];[IP config];[Override Transport]

         Where

         Where

               [Network Capabilities] Optional. A comma seprated list of network capabilities.

               [Network Capabilities] Optional. A comma seprated list of network capabilities.

                   Values must be from NetworkCapabilities#NET_CAPABILITIES_* constants.

                   Values must be from NetworkCapabilities#NET_CAPABILITIES_* constants.
@@ -389,11 +389,16 @@ 
                   use the following format to specify static IP configuration:

                   use the following format to specify static IP configuration:

                       ip=<ip-address/mask> gateway=<ip-address> dns=<comma-sep-ip-addresses>

                       ip=<ip-address/mask> gateway=<ip-address> dns=<comma-sep-ip-addresses>

                       domains=<comma-sep-domains>

                       domains=<comma-sep-domains>

               [Override Transport] Optional. An override network transport type to allow

                    the propagation of an interface type on the other end of a local Ethernet

                    interface. Value must be from NetworkCapabilities#TRANSPORT_* constants. If

                    left out, this will default to TRANSPORT_ETHERNET.

         -->

         -->

    <string-array translatable="false" name="config_ethernet_interfaces">

    <string-array translatable="false" name="config_ethernet_interfaces">

        <!--

        <!--

        <item>eth1;12,13,14,15;ip=192.168.0.10/24 gateway=192.168.0.1 dns=4.4.4.4,8.8.8.8</item>

        <item>eth1;12,13,14,15;ip=192.168.0.10/24 gateway=192.168.0.1 dns=4.4.4.4,8.8.8.8</item>

        <item>eth2;;ip=192.168.0.11/24</item>

        <item>eth2;;ip=192.168.0.11/24</item>

        <item>eth3;12,13,14,15;ip=192.168.0.12/24;1</item>

        -->

        -->

    </string-array>

    </string-array>