diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-06-01 17:21:27 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-06-01 17:21:27 +0000 |
commit | 1f392c468ae40589474ea906cffa05658741c3e0 (patch) | |
tree | 28d723bde0070828a0ba44bda36b23ee55eff877 | |
parent | 186be90eb6dbbf1fe1ad28c8faca47e9b80997d8 (diff) | |
parent | 37014a1ea2ab55a8fc76fa2a5065c07129ee7cdd (diff) |
Merge "Fix comments to reflect changes in eth service"
-rw-r--r-- | core/res/res/values/config.xml | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 6d55d0b75964..d56c7260fb03 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -368,12 +368,14 @@ [Network Capabilities] Optional. A comma seprated list of network capabilities. Values must be from NetworkCapabilities#NET_CAPABILITIES_* constants. [IP config] Optional. If empty or not specified - DHCP will be used, otherwise - static IP address with the mask. + 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> --> <string-array translatable="false" name="config_ethernet_interfaces"> <!-- - <item>eth1;12,13,14,15;192.168.0.10/24</item> - <item>eth2;;192.168.0.11/24</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> --> </string-array> |