Commit Graph

126 Commits

Author SHA1 Message Date
Xin Li
1af55fa8e0 Merge Android Pie into master am: de5179113d
am: b226b73239

Change-Id: I52a981c3d69a1fdcf4968209eea3168265142ec0
2018-08-07 17:42:59 -07:00
Xin Li
b226b73239 Merge Android Pie into master
am: de5179113d

Change-Id: Ie4f0280a4d7c07c01233ca387077c9d7d82fc4b6
2018-08-07 14:06:52 -07:00
Xin Li
de5179113d Merge Android Pie into master
Bug: 112104996
Change-Id: If0792b50c7a65f6adb4a43a8a87130b7189d9b4d
2018-08-06 16:50:56 -07:00
Xin Li
4c1ab806d9 Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
am: 264350ea3b

Change-Id: Icb2e639a96c3f1ba5c25be2e89dd0fac66623cd1
2018-06-09 02:30:19 -07:00
Xin Li
264350ea3b Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
Bug: 79597307
Change-Id: I06dd797b2badfbd1d0b8773b109e6535f540a1d8
2018-06-08 11:07:40 -07:00
Pavel Maltsev
f66e23c47b [automerger skipped] Merge "Add missing features to static IP config" am: a80cdd187b
am: 11d2d05db6  -s ours

Change-Id: I145c2a63f0fce4d527d19d35949bdd938df3991e
2018-06-01 11:35:00 -07:00
Pavel Maltsev
11d2d05db6 Merge "Add missing features to static IP config"
am: a80cdd187b

Change-Id: I7be794ac92702945a0f91948438a14f537e13b53
2018-06-01 11:23:58 -07:00
Treehugger Robot
a80cdd187b Merge "Add missing features to static IP config" 2018-06-01 17:21:27 +00:00
Pavel Maltsev
8d5e3e989a Add missing features to static IP config
In addition to IP address, OEMs should be able to set gateway, DNS and
domains.

Bug: 80090920
Test: runtest -x frameworks/opt/net/ethernet/tests

Cherry picked without conflicts.

Merged-in: I4e3d51a6955d7bfe5ca4e8079936ea10c28832e4
(cherry picked from commit e28118d0c3)

Change-Id: Ia8f095fbbcd414c070be4d5ce79dbc70bb9b1937
2018-05-31 11:51:07 -07:00
Pavel Maltsev
8c77c8b3fa Add missing features to static IP config
am: e28118d0c3

Change-Id: I49f0f09deb9550f55265a3e52e2bc84b10586e94
2018-05-31 11:12:12 -07:00
Pavel Maltsev
e28118d0c3 Add missing features to static IP config
In addition to IP address, OEMs should be able to set gateway, DNS and
domains.

Bug: 80090920
Test: runtest -x frameworks/opt/net/ethernet/tests
Change-Id: I4e3d51a6955d7bfe5ca4e8079936ea10c28832e4
2018-05-30 22:39:34 -07:00
Pavel Maltsev
502d3cf9c5 [automerger skipped] Fix overriding ip configurtion with default one am: 6c61d1013d
am: 07de1385c3  -s ours

Change-Id: I30d8743325698cb8ff19c82d8badca04ae51eaf8
2018-05-15 21:49:28 -07:00
Pavel Maltsev
07de1385c3 Fix overriding ip configurtion with default one
am: 6c61d1013d

Change-Id: I98f742a008ede5078fca2cdbdb937d4d659dea80
2018-05-15 21:45:28 -07:00
Pavel Maltsev
6c61d1013d Fix overriding ip configurtion with default one
EthernetConfigStore should return 'null' for default interface if the
default interface hasn't been configured otherwise it would be hard to
distinguish not-configured vs configured with default values.

Bug: 79415136
Test: verified w/o .xml overlay Ethernet continues to work
Test: verified that ip config from overlay is not getting overriden
Merged-In: I82933a83a7d13903bbce9a85d6e8dae1a492bf24
Merged-In: I98133ad41229b93f51ea3976d311f9896456a56c
Change-Id: I4eb914923f3664b12b6af0ae05f45b60c5312b02
(cherry picked from commit a8f3c01be9)
2018-05-16 11:36:28 +09:00
Pavel Maltsev
34c892c1d1 Merge "Fix overriding ip configurtion with default one" into pi-dev
am: 6f017e3319

Change-Id: I82933a83a7d13903bbce9a85d6e8dae1a492bf24
2018-05-15 17:01:07 -07:00
TreeHugger Robot
6f017e3319 Merge "Fix overriding ip configurtion with default one" into pi-dev 2018-05-15 23:03:46 +00:00
Pavel Maltsev
a8f3c01be9 Fix overriding ip configurtion with default one
EthernetConfigStore should return 'null' for default interface if the
default interface hasn't been configured otherwise it would be hard to
distinguish not-configured vs configured with default values.

Bug: 79415136
Test: verified w/o .xml overlay Ethernet continues to work
Test: verified that ip config from overlay is not getting overriden
Change-Id: I4eb914923f3664b12b6af0ae05f45b60c5312b02
2018-05-14 12:18:19 -07:00
Pavel Maltsev
41b59a9db7 [automerger skipped] Fix NPE during dumpsys ethernet am: aea0136d01
am: a8ed3da6b5  -s ours

Change-Id: I45e174b56cc74e5427d83b51b9153c15217315a9
2018-05-08 03:37:56 -07:00
Pavel Maltsev
a8ed3da6b5 Fix NPE during dumpsys ethernet
am: aea0136d01

Change-Id: Iaba04ea0a6ffc07a289b93cc3bf2192fcf9fb1c2
2018-05-08 03:32:27 -07:00
Pavel Maltsev
aea0136d01 Fix NPE during dumpsys ethernet
Handle the case when IpClient wasn't created for network interface which
may happen for virtual device

Bug: 78482534
Test: dumpsys ethernet
Merged-In: I374a91265660e814b4f0f033b3970fd98921ca84
Merged-In: Id4ab7c9a8a5238491c8405ae260862e76a7671c1
Change-Id: I3405dd4f72d4a6444448f0d6ec0497aead07bade
(cherry picked from commit 97446b8978)
2018-05-08 16:48:32 +09:00
Pavel Maltsev
b5cf87f771 Fix NPE during dumpsys ethernet
am: 97446b8978

Change-Id: I374a91265660e814b4f0f033b3970fd98921ca84
2018-05-07 10:32:59 -07:00
Pavel Maltsev
97446b8978 Fix NPE during dumpsys ethernet
Handle the case when IpClient wasn't created for network interface which
may happen for virtual device

Bug: 78482534
Test: dumpsys ethernet
Change-Id: I3405dd4f72d4a6444448f0d6ec0497aead07bade
2018-05-04 16:40:26 -07:00
Jeff Sharkey
8a98197771 Ethernet should be NOT_CONGESTED by default.
am: b23181bbe9

Change-Id: I4999256c8692382167d6a6a7626526a1debe0019
2018-05-02 17:47:31 -07:00
Jeff Sharkey
b23181bbe9 Ethernet should be NOT_CONGESTED by default.
Bug: 79160437
Test: builds, boots
Change-Id: Iff726805a3c6b7cf2a4b741dbba93552c378a6e1
2018-05-02 14:57:08 -06:00
Erik Kline
90110a8d54 Wait for IpClient to shutdown am: 7048285cb3 am: 206f8c6993
am: 8b075650e1

Change-Id: I1d2839f93d1bbce58935ad195fa067ef5127fabe
2018-02-23 07:51:52 +00:00
Erik Kline
8b075650e1 Wait for IpClient to shutdown am: 7048285cb3
am: 206f8c6993

Change-Id: I96b1a4a706afc82b7a4a59f311798e3825b0ee00
2018-02-23 07:46:34 +00:00
Erik Kline
206f8c6993 Wait for IpClient to shutdown
am: 7048285cb3

Change-Id: I82d6635bac0836852bff74005ce75a6c36c570db
2018-02-23 07:40:03 +00:00
Erik Kline
7048285cb3 Wait for IpClient to shutdown
This makes sure that we never accidentally have two IpClients vying
for control of the same interface.

Test: as follows
    - built
    - flashed
    - booted
Bug: 62476366
Change-Id: Iab4ca7c2445e70b6f8beaf5dc6921cb0c6cd56ed
2018-02-21 15:10:01 -08:00
Luis Hector Chavez
8e63de18cc Avoid re-creating an IpClient if the network has already started am: de93b3eb05 am: e340642858
am: fdd22f0150

Change-Id: I74b63b47f4e79a2fb2aa27c5c4d8edd8c51ea63e
2018-02-21 20:47:34 +00:00
Luis Hector Chavez
fdd22f0150 Avoid re-creating an IpClient if the network has already started am: de93b3eb05
am: e340642858

Change-Id: I7da9c17743455abc21096cdd365e316d3376e4ad
2018-02-21 20:41:02 +00:00
Luis Hector Chavez
e340642858 Avoid re-creating an IpClient if the network has already started
am: de93b3eb05

Change-Id: Id4f8fa2fa3c4c929cdc777125f6e85dce9187bff
2018-02-21 20:33:31 +00:00
Luis Hector Chavez
de93b3eb05 Avoid re-creating an IpClient if the network has already started
This change avoids calling start() on needNetworkFor() if an IpClient
object has already been created. This is the case when the interface is
connected from boot, as is the case in Chrome OS.

Bug: 73396557
Test: Networking is 100% stable in Chrome OS
Change-Id: Iaa073d6477aadca2e4e5233b333d717ad82c1f3d
2018-02-21 20:25:20 +00:00
Pavel Maltsev
95d2fe0913 Enable multiple active Ethernet interfaces am: 52d046eb8a am: aaeb281ee3
am: a4da98df93

Change-Id: I1f9f7dca0f26363898318e87acf0212f8af66bbd
2018-02-04 01:06:55 +00:00
Pavel Maltsev
a4da98df93 Enable multiple active Ethernet interfaces am: 52d046eb8a
am: aaeb281ee3

Change-Id: I504a938709a54a9bb662f106e5a4844b45767257
2018-02-03 01:25:47 +00:00
Pavel Maltsev
aaeb281ee3 Enable multiple active Ethernet interfaces
am: 52d046eb8a

Change-Id: I0cbd8de0f1bafb2579f51d8c3ad7af9c165db565
2018-02-03 00:08:08 +00:00
Pavel Maltsev
52d046eb8a Enable multiple active Ethernet interfaces
- reworked EthernetNetworkFactory to support multiple active Ethernet
interfaces
- allow vendors to specify network capabilities + ip config through XML
config overlay

Test: manual using hikey960 + multiple usb->eth adapters
Change-Id: Ie39bcb0d2a3f960f497222159c7bd5797accaa68
2018-01-25 14:56:40 -08:00
Jeff Sharkey
f870e3c650 Merge "Add "not congested" network capability." am: a289c9eb47 am: fa151c0ef9
am: e46131e271

Change-Id: If64d200978b44b627c94188d6a1b253bbbfe9dd2
2018-01-18 04:20:48 +00:00
Jeff Sharkey
e46131e271 Merge "Add "not congested" network capability." am: a289c9eb47
am: fa151c0ef9

Change-Id: Ie901fd5f67383950c4789479f945379b4f274fd4
2018-01-18 04:10:03 +00:00
Jeff Sharkey
fa151c0ef9 Merge "Add "not congested" network capability."
am: a289c9eb47

Change-Id: Iee5b6d1b5f7d080f4b31f4a65950f0c326f6908c
2018-01-18 03:58:19 +00:00
Jeff Sharkey
a289c9eb47 Merge "Add "not congested" network capability." 2018-01-18 03:28:34 +00:00
Jeff Sharkey
efe4af4926 Add "not congested" network capability.
Can be used by a network to indicate when it's congested, meaning that
apps should defer network traffic that could be done at a later time.

Test: bit FrameworksNetTests:android.net.,com.android.server.net.,com.android.server.connectivity.VpnTest,com.android.server.ConnectivityServiceTest
Bug: 64133169
Change-Id: I97664d041920c8d6e3f9fb7c9e8638925b15c30e
2018-01-17 02:30:28 -07:00
Xin Li
8bea35d3eb Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
am: ab94a65656

Change-Id: Iaf39a0f0235429bcc96447546dbb1569b46119b8
2017-11-15 01:34:34 +00:00
Xin Li
ab94a65656 Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
Change-Id: I0674e13bcf580439c257d1eced1ea2c780327654
2017-11-14 16:38:19 -08:00
Xin Li
7e00d1d04c Merge commit 'a1081715561b15daf2018c74e9aff434f602fcc9' into HEAD
Change-Id: I1da9335d26d418de026c25d59aa6ee43af6d602c
2017-11-13 14:35:38 -08:00
Jeff Sharkey
3b58783f26 Define NOT_ROAMING network capability. am: 30b747ef95 am: 497505d690
am: e929c5fc0e

Change-Id: I868074a695230f017a346abb5b9866577a760c9e
2017-11-03 23:14:07 +00:00
Jeff Sharkey
e929c5fc0e Define NOT_ROAMING network capability. am: 30b747ef95
am: 497505d690

Change-Id: I51902dbfdfaa49a8318f70752919a206f384f633
2017-11-03 23:03:01 +00:00
Jeff Sharkey
497505d690 Define NOT_ROAMING network capability.
am: 30b747ef95

Change-Id: Iffb3dad690a7986c6842976cfe39b1fbf7e68057
2017-11-03 22:52:18 +00:00
Jeff Sharkey
30b747ef95 Define NOT_ROAMING network capability.
The "roaming" state of a network really belongs on NetworkCapabilities
instead of being published through NetworkInfo.isRoaming().  One major
reason is to support developers creating NetworkRequests for a
non-roaming network.

Test: bit FrameworksNetTests:android.net.,com.android.server.net.,com.android.server.connectivity.
Bug: 68397798, 16207332
Change-Id: I0722d7b38d0478de3834b869552f48403af9d553
2017-10-30 12:02:14 -06:00
Elvis Chien
6691db85e7 ethernet: Fix the connect fail issue when switch DHCP to Static config at Ethernet interface. am: 89ffed793f am: 726e301e7b am: 89401fd992
am: b3e0136ddb

Change-Id: I3250046652086f12c5003bed406bfb262d34949b
2017-10-19 07:53:13 +00:00
Elvis Chien
b3e0136ddb ethernet: Fix the connect fail issue when switch DHCP to Static config at Ethernet interface. am: 89ffed793f am: 726e301e7b
am: 89401fd992

Change-Id: I6fa229ad44909161adf6706d46a1e82a07f8528d
2017-10-19 07:50:43 +00:00