OSDN Git Service

Update config file documentation and examples for network type propagation
authorSal Savage <salsavage@google.com>
Wed, 9 Jan 2019 23:31:30 +0000 (15:31 -0800)
committerSal Savage <salsavage@google.com>
Tue, 22 Jan 2019 20:35:07 +0000 (12:35 -0800)
Bug: 112588045
Test: N/A -- only updates comments
Change-Id: Iae5363e06d3f79e308f49cd64c286695722adf73

core/res/res/values/config.xml

index 0985ac3..8ea2ab7 100644 (file)
 
 
     <!-- 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
                [Network Capabilities] Optional. A comma seprated list of network capabilities.
                    Values must be from NetworkCapabilities#NET_CAPABILITIES_* constants.
                    use the following format to specify static IP configuration:
                        ip=<ip-address/mask> gateway=<ip-address> dns=<comma-sep-ip-addresses>
                        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">
         <!--
         <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>eth3;12,13,14,15;ip=192.168.0.12/24;1</item>
         -->
     </string-array>