summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2020-05-11 13:25:28 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2020-05-11 13:25:28 +0000
commit21467667832bcbb37f3e8ae04638665d93d22d0c (patch)
tree3c3158b424941334f1332f52c47d5430a79aadcb
parentb80e0dac8705dde300cc88da7c35c98f110a0ddf (diff)
parent65b753759d3883dd8189213d9db5ae070db35582 (diff)
Merge "Add the NOT_SUSPENDED capability to Ethernet - doc part"
-rw-r--r--core/res/res/values/config.xml7
1 files changed, 4 insertions, 3 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 6cbea4074484..2ab44447fde2 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -419,13 +419,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>