diff options
| author | 2020-05-11 13:57:36 +0000 | |
|---|---|---|
| committer | 2020-05-21 05:12:14 +0000 | |
| commit | 81ffe374d89307b0762a66a5b4be643b0f225376 (patch) | |
| tree | fa5ea4939db959d1eb2d3b2f3b3621bccc85bfaf | |
| parent | 92d678d8ad4ad579b039b15e1b56dea5ed39c9ad (diff) | |
Add the NOT_SUSPENDED capability to Ethernet - doc part
Test: ConnectivityServiceTest, EthernetManagerTest
Bug: 150570873
Original-Change: https://android-review.googlesource.com/1307373
Merged-In: I151dfaa90b245dfc67d83516081b965284386d6a
Change-Id: I151dfaa90b245dfc67d83516081b965284386d6a
| -rw-r--r-- | core/res/res/values/config.xml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index ac808df7ef5d..a205fcf9520b 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -446,13 +446,14 @@ <!-- Regex of wired ethernet ifaces --> <string translatable="false" name="config_ethernet_iface_regex">eth\\d</string> - - <!-- Configuration of Ethernet interfaces in the following format: <interface name|mac address>;[Network Capabilities];[IP config];[Override Transport] Where [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 use the following format to specify static IP configuration: ip=<ip-address/mask> gateway=<ip-address> dns=<comma-sep-ip-addresses> |