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

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

Browse Source 
am: bfd44b60ef

Change-Id: I0b1690102776065a7f1c1156e9c4808a8c111e29
This commit is contained in:
Sal Savage
2019-01-22 16:43:27 -08:00
committed by android-build-merger
parent 56ed214f67 bfd44b60ef
commit a414bf1691
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -372,7 +372,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.
@@ -380,11 +380,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>