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

Merge "Merge "Add the NOT_SUSPENDED capability to Ethernet - doc part" am: 2146766783 am: d4ac8044ff" into rvc-dev-plus-aosp am: ce7e2d9f81

Browse Source 
Change-Id: I8a8828f1d41f619d8e049305e7d4396598c5f164
This commit is contained in:
Automerger Merge Worker
2020-05-11 14:17:24 +00:00
parent 2f59f928ca ce7e2d9f81
commit d33a660cd1
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -444,13 +444,14 @@
<!-- Regex of wired ethernet ifaces --> <!-- Regex of wired ethernet ifaces -->
<string translatable="false" name="config_ethernet_iface_regex">eth\\d</string> <string translatable="false" name="config_ethernet_iface_regex">eth\\d</string>
<!-- Configuration of Ethernet interfaces in the following format: <!-- Configuration of Ethernet interfaces in the following format:
<interface name|mac address>;[Network Capabilities];[IP config];[Override Transport] <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_CAPABILITY_* constants.
The NOT_ROAMING, NOT_CONGESTED and NOT_SUSPENDED capabilities are always
added automatically because this configuration provides no way to update
them dynamically.
[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
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>