diff options
| author | 2017-06-21 23:27:55 +0900 | |
|---|---|---|
| committer | 2017-06-29 17:26:11 +0900 | |
| commit | e8fcd6b14ac36c9e786d7e0cf72c98fcdfcf4fe0 (patch) | |
| tree | 196390458da47eb84aae2550bd4d1e27918039c6 | |
| parent | db8e4efd5bb60aa05cd9f581f39cd016da4fab70 (diff) | |
No need to explicitly list ethernet upstream type
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
Bug: 32163131
Bug: 36076442
Change-Id: I743c20d5b969e33c6b10d0b47ac06e6b8c968acf
| -rw-r--r-- | core/res/res/values/config.xml | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 7dbd44acc5a9..98f16c29db79 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -393,12 +393,21 @@ <!-- Array of ConnectivityManager.TYPE_xxxx values allowable for tethering --> <!-- Common options are [1, 4] for TYPE_WIFI and TYPE_MOBILE_DUN or <!== [0,1,5,7] for TYPE_MOBILE, TYPE_WIFI, TYPE_MOBILE_HIPRI and TYPE_BLUETOOTH --> + <!-- This list is also modified by code within the framework, including: + + - TYPE_ETHERNET (9) is prepended to this list, and + - the output of TelephonyManager.getTetherApnRequired() + determines whether both TYPE_MOBILE (0) and TYPE_HIPRI (5) + or TYPE_MOBILE_DUN (4) are appended (if not already present). + + For other changes applied to this list, now and in the future, see + com.android.server.connectivity.tethering.TetheringConfiguration. + --> <integer-array translatable="false" name="config_tether_upstream_types"> <item>0</item> <item>1</item> <item>5</item> <item>7</item> - <item>9</item> </integer-array> <!-- If the DUN connection for this CDMA device supports more than just DUN --> |