Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix comments to reflect changes in eth service"

Browse Source 
am: 1f392c468a

Change-Id: I542f43603ef19387c57b74cdadf0900548256c39
This commit is contained in:
Pavel Maltsev
2018-06-01 11:28:04 -07:00
committed by android-build-merger
parent 5c0601d65a 1f392c468a
commit 967ee98726
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/res/res/values/config.xml
View File

@@ -368,12 +368,14 @@
[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.
[IP config] Optional. If empty or not specified - DHCP will be used, otherwise [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"> <string-array translatable="false" name="config_ethernet_interfaces">
<!-- <!--
<item>eth1;12,13,14,15;192.168.0.10/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;;192.168.0.11/24</item> <item>eth2;;ip=192.168.0.11/24</item>
--> -->
</string-array> </string-array>