Commit Graph

564 Commits

Author SHA1 Message Date
Chalard Jean
c52fab7839 Strategic fix for infinite loop am: b3aa618706
am: eebab15de9

Change-Id: Ief1615fa116526ddee07a6fbedf78aa8e62035b4
2018-10-18 01:13:17 -07:00
Chalard Jean
eebab15de9 Strategic fix for infinite loop
am: b3aa618706

Change-Id: Ie6596461792dbe3f38b68f12e11cb9dcd0f7b104
2018-10-18 01:10:16 -07:00
Lorenzo Colitti
4f316a4420 Don't consider TRACK_DEFAULT requests in EthernetNetworkFactory.
These should not affect network refcount and thus should not be
passed to the network transport.

Bug: 116034205
Test: successfully established a VPN when connected to USB ethernet
Change-Id: I66517d86f35b8cfc1e211cb189127187d2744b60
2018-10-16 17:36:40 +09:00
Chalard Jean
7dcb06ea25 Strategic fix for infinite loop am: 33893d68d4 am: 874fbe4b27
am: d708d70026

Change-Id: Ibdffb4512a74ed8190ec35b696843b6c1abfdf41
2018-08-22 08:02:20 -07:00
Chalard Jean
9d33c836d4 Merge "Tiny tiny style fix" am: 6d262af067 am: f05daf0388
am: 7d687a4e7d

Change-Id: I8efd2f55388d6a1f917814064b10429c1752b298
2018-08-22 07:48:59 -07:00
Chalard Jean
d708d70026 Strategic fix for infinite loop am: 33893d68d4
am: 874fbe4b27

Change-Id: I76d22f4363421aaffd947bb2edf87642fae6fd89
2018-08-22 07:11:30 -07:00
Chalard Jean
7d687a4e7d Merge "Tiny tiny style fix" am: 6d262af067
am: f05daf0388

Change-Id: If99fe1e18725aff2036e1d967b16be2ba5590f59
2018-08-22 05:40:58 -07:00
Chalard Jean
874fbe4b27 Strategic fix for infinite loop
am: 33893d68d4

Change-Id: Ib2e7b639986b6f299baafd818494f5bd3f2ffcca
2018-08-22 05:32:12 -07:00
Chalard Jean
f05daf0388 Merge "Tiny tiny style fix"
am: 6d262af067

Change-Id: I05f2224854a7a78de80da75123695ffbac2e17fd
2018-08-22 04:17:26 -07:00
Chalard Jean
b3aa618706 Strategic fix for infinite loop
Bug: 111326363
Test: Manual + atest frameworks-net + atest frameworks/opt/net/ethernet/tests/java/com/android/server
Change-Id: Id262df4e41de5c74784637ae4a5459c3fab9fb74
2018-08-22 09:31:29 +00:00
Chalard Jean
33893d68d4 Strategic fix for infinite loop
Bug: 111326363
Test: Manual + atest frameworks-net
Change-Id: Id262df4e41de5c74784637ae4a5459c3fab9fb74
2018-08-22 06:25:27 +00:00
Chalard Jean
6d262af067 Merge "Tiny tiny style fix" 2018-08-22 01:44:19 +00:00
Chalard Jean
153ef57146 Tiny tiny style fix
Test: none needed
Change-Id: Ic6cfedf9cfe60984ce7fbd59bdaec55b0bba3001
2018-08-21 18:18:41 +09:00
Colin Cross
77c81f41df Convert frameworks/opt/net/ethernet to Android.bp am: 4da7fda56b am: c5d21eaa24
am: 22ba385503

Change-Id: If2636f25fe7cdd56f2ac5d7254ff7026ac63796e
2018-08-17 18:44:53 -07:00
Colin Cross
22ba385503 Convert frameworks/opt/net/ethernet to Android.bp am: 4da7fda56b
am: c5d21eaa24

Change-Id: I7dcfa76eabb736395b1a1854fc332c41f3b86b13
2018-08-17 17:59:45 -07:00
Colin Cross
c5d21eaa24 Convert frameworks/opt/net/ethernet to Android.bp
am: 4da7fda56b

Change-Id: Id39eb34fbf49a6953c40a354d4a2b3de25b283e3
2018-08-17 17:14:55 -07:00
Colin Cross
4da7fda56b Convert frameworks/opt/net/ethernet to Android.bp
See build/soong/README.md for more information.

Test: m checkbuild
Test: atest EthernetServiceTests
Change-Id: Ic9243ae7719a25a8749d63a5dcac7ec5adffe303
2018-08-16 21:52:37 -07:00
Xin Li
5f4dd595e0 Merge Android Pie into master am: de5179113d am: b226b73239 am: 1af55fa8e0
am: 87da98a657

Change-Id: I97764e1ef6916732506fcfc7e02447b1b9917363
2018-08-08 02:40:29 -07:00
Xin Li
87da98a657 Merge Android Pie into master am: de5179113d am: b226b73239
am: 1af55fa8e0

Change-Id: I633d54ffb911240f881f88467af9400f1899734e
2018-08-07 21:50:27 -07:00
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
84a30537bb Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master am: 264350ea3b
am: 4c1ab806d9

Change-Id: I2866601a8799371526be3d5a5555840141ed7be6
2018-06-09 06:02:03 -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
android-build-team Robot
64c1fd1555 Snap for 4818534 from e28118d0c3 to pi-release
Change-Id: I8a39d0b29bd6f3055d316be12f3a6033372f30a8
2018-06-03 07:21:05 +00:00
Pavel Maltsev
50792da1b4 [automerger skipped] Merge "Add missing features to static IP config" am: a80cdd187b am: 11d2d05db6 -s ours
am: f66e23c47b  -s ours

Change-Id: I88198a063e6971733552cf9f083b9645880bed8f
2018-06-01 11:45:50 -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
ff7d9bee0c Add missing features to static IP config am: e28118d0c3
am: 8c77c8b3fa

Change-Id: I218c55ef1bff8da9cf46a3583b4d53f537082c94
2018-05-31 12:50:31 -07: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
android-build-team Robot
8e9e564da0 Snap for 4784261 from 6f017e3319 to pi-release
Change-Id: I2cfd126dffdf77e9d7b8adae6266db9fc350e20b
2018-05-16 07:26:10 +00:00
Pavel Maltsev
04bd7277ca [automerger skipped] Fix overriding ip configurtion with default one am: 6c61d1013d am: 07de1385c3 -s ours
am: 502d3cf9c5  -s ours

Change-Id: I8d41aaf789a90e71fc1e9327d804db3dd0e947d8
2018-05-15 21:53:31 -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
1e83b82827 Merge "Fix overriding ip configurtion with default one" into pi-dev am: 6f017e3319
am: 34c892c1d1

Change-Id: I98133ad41229b93f51ea3976d311f9896456a56c
2018-05-15 17:08:42 -07: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
d04b24f60e [automerger skipped] Fix NPE during dumpsys ethernet am: aea0136d01 am: a8ed3da6b5 -s ours
am: 41b59a9db7  -s ours

Change-Id: I21f0faf0ca595d3180baabc09b970ae3ed7c7b04
2018-05-08 03:44:28 -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
android-build-team Robot
b49f10e22f Snap for 4767765 from 97446b8978 to pi-release
Change-Id: I374d7500bd788530d544402409af579ae3befde4
2018-05-08 07:25:08 +00:00
Pavel Maltsev
5f490a1101 Fix NPE during dumpsys ethernet am: 97446b8978
am: b5cf87f771

Change-Id: Id4ab7c9a8a5238491c8405ae260862e76a7671c1
2018-05-07 10:40:35 -07:00
Pavel Maltsev
b5cf87f771 Fix NPE during dumpsys ethernet
am: 97446b8978

Change-Id: I374a91265660e814b4f0f033b3970fd98921ca84
2018-05-07 10:32:59 -07:00