diff options
| author | 2018-05-30 12:31:21 -0700 | |
|---|---|---|
| committer | 2018-05-31 11:58:53 -0700 | |
| commit | 37014a1ea2ab55a8fc76fa2a5065c07129ee7cdd (patch) | |
| tree | 4284d92b950f21a0a0f4d4ad102ada078efb8942 | |
| parent | acbd94d76f1d91707288f9f921c36faea385af48 (diff) | |
Fix comments to reflect changes in eth service
OEMs should be able to set gateway, DNS and domain for their static IP
configuration.
Cherry picked without conflicts.
Bug: 80090920
Test: m
Merged-in: Id7b6d538e2551cbd188821feb4b4feb102e4c751
(cherry picked from commit d6b0780628bf4f758fd68534b4ecdf2da0fe2a7f)
Change-Id: I347a91e202fb6d6f1ae893c097c7d2e8856a3593
| -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> |