Commit Graph

402 Commits

Author SHA1 Message Date
Ady Abraham
7a4fecc3de Revert "Set EthernetNetworkSpecifier on each ethernet network for multi-ethernet"
This reverts commit b94c4e7453.

Reason for revert: b/196387077

Change-Id: I8e27ce915b6069b642c614a018aa5e1788ae07af
2021-08-12 17:16:51 +00:00
Milim Lee
b94c4e7453 Set EthernetNetworkSpecifier on each ethernet network for multi-ethernet
Bug: 175199512
Test: Build and test multi-ethernet
Change-Id: I6ec50b42bee89520f6f27d40e0d2b0d774b8e2e5
2021-07-29 13:41:18 +09:00
Chiachang Wang
bbd8b43c93 Replace clearAll with withoutDefaultCapabilities in NC#Builder
Update the naming and usgae according to API review feedback.

Bug: 184735772
Test: atest EthernetTrackerTest
Change-Id: Ie8dc0bcdf46ceebda5d6062231b48c1f63b250f6
Merged-In: Ie8dc0bcdf46ceebda5d6062231b48c1f63b250f6
2021-05-14 10:36:56 +00:00
lucaslin
fe134fbd9c Add transport type in capabilities filter of EthernetNetworkFacotry
Bug: 167544279
Test: atest EthernetServiceTests
Change-Id: Ie64e3cff0ace413f14682736de7a1b65fa93e705
Merged-In: Ie64e3cff0ace413f14682736de7a1b65fa93e705
    (Cherry-picked from ag/14031548)
2021-05-05 05:11:49 +00:00
Chiachang Wang
58e0c49c2e Remove hidden connectivity methods usage in ethernet test
Bug: 182859030
Test: atest EthernetTrackerTest
Test: 1. remove framework-connectivity.impl from framework bp
      2. cd frameworks/opt/net/ethernet/tests ; mm
Change-Id: Ifaeebfca75dc77eec30dd722ddb3166610795b26
2021-04-14 16:31:37 +08:00
lucaslin
19b7b3dfbd Use public API instead of hidden API in EthernetTracker
- Use public API of StaticIpConfiguration.Builder to set
ipaddress, domains, gateway and dnsServers.
- Use public constructor to create an instance of IpConfiguration
and set IpAssignment, ProxySettings, StaticIpConfiguration and
HttpProxy by public API.

Bug: 182963415
Test: m ethernet-service
Change-Id: Idce8bfe7afc31baa644c816afa1f8004987e8c6e
Merged-In: Idce8bfe7afc31baa644c816afa1f8004987e8c6e
2021-03-23 09:45:57 +00:00
junyulai
c439eae5b4 Replace reference of NetworkAgent#setLegacyExtraInfo
Bug: 182963415
Test: m ethernet-service
Test: atest EthernetServiceTests
Change-Id: I4a66f34daa129b3158e4dd2fb720c175611eaf69
2021-03-19 14:15:39 +08:00
junyulai
89764da132 Replace references of request.networkCapabilies
Replaced by request.canBesatisfiedBy() to avoid direct reference
of hidden member.

Bug: 182963415
Test: m ethernet-service
Test: atest EthernetServiceTests
Change-Id: I2a27410a6148c525e17a11cb1ba3570f04e60b5d
2021-03-19 14:13:19 +08:00
lucaslin
df51759103 Use clearAll() of NetworkCapabilities.Builder instead
NetworkCapabilities#clearAll() is a hidden API, use clearAll()
of NetworkCapabilities.Builder instead.

Bug: 182963415
Test: m ethernet-service
Test: atest EthernetServiceTests
Change-Id: I87745b5f7a5817f95cdbc623b2313c181ff48f19
2021-03-18 14:45:22 +08:00
Remi NGUYEN VAN
ddbc35510e Merge "Rename StringNetworkSpecifier to Ethernet" 2021-03-11 23:51:49 +00:00
Frank Li
35a6de8db3 Merge "[CS09]Remove hidden API usage of NetworkRequest" 2021-03-11 15:56:55 +00:00
lifr
60ce2ec168 [CS09]Remove hidden API usage of NetworkRequest
The connection service will become the mainline module.
So, need to remove the hidden API usage of NetworkRequest.
The NetworkRequest.type(TRACK_DEFAULT) is no longer sent
to the factories. So, remove the (TRACK_DEFAULT) check to
avoid using hidden API.

Bug: 170598012
Test: atest EthernetServiceTests
Change-Id: I5b5fed864318e9ac7e190c40d4f52076ab0eece8
2021-03-11 23:55:04 +08:00
Remi NGUYEN VAN
a837199195 Rename StringNetworkSpecifier to Ethernet
The new specifier represents ethernet interfaces more
specifically and is part of the public API.

Bug: 179329291
Test: atest CtsNetTestCases
Merged-In: I6cba1709b3007a22d95849a1281237c77e1464a4
Change-Id: I6cba1709b3007a22d95849a1281237c77e1464a4
2021-03-10 09:20:39 +09:00
lifr
89f2f50aee [CS07]Remove hidden API usage of NetworkCapabilities
The connection service will become the mainline module. The mutable
NetworkCapabilities is deprecated, and the NetworkCapabilities should
be built through their Builder instead.

Bug: 170598012
Test: atest EthernetServiceTests
Change-Id: I09661ddda24d652ed791a7c6b093541e20a15e77
2021-03-05 16:45:48 +08:00
Bob Badour
0c6adf259a [LSC] Add LOCAL_LICENSE_KINDS to frameworks/opt/net/ethernet am: 7909a21be4
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1589022

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I73590df458989f1e782c8cac40ff2f0bb5764a71
2021-02-16 18:18:45 +00:00
Bob Badour
7909a21be4 [LSC] Add LOCAL_LICENSE_KINDS to frameworks/opt/net/ethernet
Added SPDX-license-identifier-Apache-2.0 to:
  Android.bp
  tests/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: I9e5f4513d6a737c8e31639babd7a4e6342968214
2021-02-16 04:09:57 -08:00
lifr
ef49ca71d1 [CS02]Remove hidden API usage of NetworkCapabilities am: 810d8f0c94
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1563812

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6354d113ef98ac47e293d2226f6d55445b487d09
2021-02-16 03:08:00 +00:00
lifr
810d8f0c94 [CS02]Remove hidden API usage of NetworkCapabilities
The connection service will become the mainline module. The mutable
NetworkCapabilities is deprecated, and the NetworkCapabilities should
be built through their Builder instead.

Bug: 170598012
Test: atest EthernetServiceTests
Change-Id: I31f12a39a924302beca980b8d920e3c5c18816d4
2021-02-09 20:45:09 +08:00
Lucas Lin
3b3a107f9f Merge "Replace the usage of NetworkManagementService with NetdUtils" am: ab2e555c99
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1553695

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1d046fc871922ae2c836372d02e8ce463946dfad
2021-02-02 04:18:56 +00:00
Lucas Lin
ab2e555c99 Merge "Replace the usage of NetworkManagementService with NetdUtils" 2021-02-02 03:38:37 +00:00
junyulai
933f907992 [VCN07.4] Add NOT_VCN_MANAGED for NetworkAgent implementations am: c8148a18d0
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1563133

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib3199fedff2d70a1a2245b9e5bea4c37424a1063
2021-01-29 20:46:59 +00:00
junyulai
c8148a18d0 [VCN07.4] Add NOT_VCN_MANAGED for NetworkAgent implementations
Follow-up from aosp/1549897, the capability will not be in
default capabilities, but will be in most of the NetworkRequests
which requires internet. Thus, add the capabilities into all
NetworkAgent implementations by default to provide
backward compatibility.

Test: TH
Bug: 175662146
Change-Id: Ib6e203571946e3094e4ce534b108f796cc3b8fb7
2021-01-28 14:52:12 +08:00
lucaslin
3c098c26d4 Fix EthernetTrackerTest#createNetworkCapabilities am: e81b053c1f
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1553694

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I255f9526a9664f832d1f90b8f348cd3876f5ae4e
2021-01-27 04:37:55 +00:00
lucaslin
88f4df8e0f Replace the usage of NetworkManagementService with NetdUtils
Since NetdUtils has the same method(setInterfaceUp) as
NetworkManagementService, replace the usage of NMS with NetdUtils.

Bug: 170598012
Test: atest EthernetServiceTests
Change-Id: Id0f8e17e9d6237fa8ab157c96dd982c47007a453
2021-01-26 08:42:18 +00:00
lucaslin
e81b053c1f Fix EthernetTrackerTest#createNetworkCapabilities
aosp/1307433 added NET_CAPABILITY_NOT_ROAMING,
NET_CAPABILITY_NOT_CONGESTED and NET_CAPABILITY_NOT_SUSPENDED
for ethernet but forgot to run and modify EthernetTrackerTest.
Follow aosp/1307433 to add NET_CAPABILITY_NOT_ROAMING,
NET_CAPABILITY_NOT_CONGESTED and NET_CAPABILITY_NOT_SUSPENDED for
ethernet in test when verifying the network capabilities of
ethernet.

Bug: 177782157
Test: atest EthernetServiceTests
Change-Id: I32c596b1b7726c47818460ea646bf5e346825887
2021-01-26 07:12:28 +00:00
Chalard Jean
292478714f [NS01.eth] Remove a useless argument am: be2858b9da
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1547575

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5cb4065a939eb06b166db6681bbcdb7031d1cef9
2021-01-12 11:10:52 +00:00
Chalard Jean
be2858b9da [NS01.eth] Remove a useless argument
Test: FrameworksNetTests
Change-Id: Ib262871e4909ae65b5e6b2e52d2f25bf5a653f34
2021-01-12 16:29:55 +09:00
Remi NGUYEN VAN
293edbd326 [automerger skipped] Add TRANSPORT_TEST to test ethernet interfaces am: ecb5efcd76 am: 144b4fb2be am: 53f9d057ab -s ours
am skip reason: Change-Id Ife3eab06432cabf3ee626de49abc31c8349b4316 with SHA-1 ecb5efcd76 is in history

Original change: undetermined

Change-Id: I634d203a61cb79328919f6b9a901d6645f9a605f
2020-06-02 01:01:57 +00:00
Remi NGUYEN VAN
dacf8abacc [automerger skipped] Add TRANSPORT_TEST to test ethernet interfaces am: ecb5efcd76 am: 144b4fb2be -s ours am: 6b4541e823 -s ours
am skip reason: Change-Id Ife3eab06432cabf3ee626de49abc31c8349b4316 with SHA-1 ecb5efcd76 is in history

Original change: undetermined

Change-Id: Icec39916e646611fb025db251128e38d091d9d99
2020-06-02 00:53:22 +00:00
Remi NGUYEN VAN
53f9d057ab Add TRANSPORT_TEST to test ethernet interfaces am: ecb5efcd76 am: 144b4fb2be
Original change: undetermined

Change-Id: I739b5ca504011c319aec4d90d9a07c27226af3fe
2020-06-02 00:41:51 +00:00
Remi NGUYEN VAN
6b4541e823 [automerger skipped] Add TRANSPORT_TEST to test ethernet interfaces am: ecb5efcd76 am: 144b4fb2be -s ours
am skip reason: Change-Id Ife3eab06432cabf3ee626de49abc31c8349b4316 with SHA-1 ecb5efcd76 is in history

Original change: undetermined

Change-Id: I88abf31fec515407682bc82e8c91053deac86d9b
2020-06-02 00:41:38 +00:00
Remi NGUYEN VAN
5c6f2af767 [automerger skipped] Add TRANSPORT_TEST to test ethernet interfaces am: ecb5efcd76 -s ours am: addbc6981d -s ours am: 920c766d80 -s ours
am skip reason: Change-Id Ife3eab06432cabf3ee626de49abc31c8349b4316 with SHA-1 1849ebd9c3 is in history

Original change: undetermined

Change-Id: Icb7c08603e187fd0b8f726406e6c2ac3fc23c513
2020-06-02 00:34:56 +00:00
Remi NGUYEN VAN
920c766d80 [automerger skipped] Add TRANSPORT_TEST to test ethernet interfaces am: ecb5efcd76 -s ours am: addbc6981d -s ours
am skip reason: Change-Id Ife3eab06432cabf3ee626de49abc31c8349b4316 with SHA-1 1849ebd9c3 is in history

Original change: undetermined

Change-Id: Ifa6d62b03904da279b7a3ad8d3b0accfde9fe6fd
2020-06-02 00:33:33 +00:00
Remi NGUYEN VAN
144b4fb2be Add TRANSPORT_TEST to test ethernet interfaces am: ecb5efcd76
Original change: undetermined

Change-Id: I4fbb709bfead8e55e54895aed6cf317de2b4d37b
2020-06-02 00:25:06 +00:00
Remi NGUYEN VAN
addbc6981d [automerger skipped] Add TRANSPORT_TEST to test ethernet interfaces am: ecb5efcd76 -s ours
am skip reason: Change-Id Ife3eab06432cabf3ee626de49abc31c8349b4316 with SHA-1 1849ebd9c3 is in history

Original change: undetermined

Change-Id: I8487f1b5ed1b2db27f3a9aef7466eafcf312c75f
2020-06-02 00:24:45 +00:00
Remi NGUYEN VAN
ecb5efcd76 Add TRANSPORT_TEST to test ethernet interfaces
Because they operate on test interfaces, ethernet interfaces included
with setIncludeTestInterfaces should have TRANSPORT_TEST.

Bug: 156319532
Test: atest CaptivePortalApiTest
Original-Change: https://android-review.googlesource.com/1318214
Merged-In: Ife3eab06432cabf3ee626de49abc31c8349b4316
Change-Id: Ife3eab06432cabf3ee626de49abc31c8349b4316
2020-06-01 01:43:58 +00:00
Remi NGUYEN VAN
3189b60104 Add TRANSPORT_TEST to test ethernet interfaces am: 1849ebd9c3 am: 67c1ef1f1f am: c0375506c2 am: e9e3ec2744
Change-Id: Ieff378a201e2ee8d1fc14eade9cc755dafee187b
2020-05-29 22:40:39 +00:00
Remi NGUYEN VAN
e9e3ec2744 Add TRANSPORT_TEST to test ethernet interfaces am: 1849ebd9c3 am: 67c1ef1f1f am: c0375506c2
Change-Id: I3748584123536499c93ae753cc9d91f1743d9ac0
2020-05-29 22:27:01 +00:00
Remi NGUYEN VAN
c0375506c2 Add TRANSPORT_TEST to test ethernet interfaces am: 1849ebd9c3 am: 67c1ef1f1f
Change-Id: Icab42e355c02d734b9fbc3471be1946ff069efdb
2020-05-29 22:09:13 +00:00
Remi NGUYEN VAN
1849ebd9c3 Add TRANSPORT_TEST to test ethernet interfaces
Because they operate on test interfaces, ethernet interfaces included
with setIncludeTestInterfaces should have TRANSPORT_TEST.

Bug: 156319532
Test: atest CaptivePortalApiTest
Change-Id: Ife3eab06432cabf3ee626de49abc31c8349b4316
2020-05-27 12:35:40 +09:00
Automerger Merge Worker
8b97aaeeab Merge "[automerger skipped] Add capability they should always have to eth networks. am: 2bdb206bc0 am: 5254e08e73 am: 786abd27cb -s ours" into rvc-qpr-dev-plus-aosp 2020-05-21 07:19:09 +00:00
Chalard Jean
54029c2163 [automerger skipped] Add capability they should always have to eth networks. am: 2bdb206bc0 am: 5254e08e73 am: 786abd27cb -s ours
am skip reason: Change-Id I6f75e2b26eb9f554243bc418142a4dc18839aa79 with SHA-1 2bdb206bc0 is in history

Change-Id: I95cc75055a3f97bb5648cf94b99b1677ee560b2c
2020-05-21 07:19:04 +00:00
Chalard Jean
187896c3d2 [automerger skipped] Add capability they should always have to eth networks. am: 2bdb206bc0 -s ours am: 269bc92343 -s ours am: 49621f7884 -s ours
am skip reason: Change-Id I6f75e2b26eb9f554243bc418142a4dc18839aa79 with SHA-1 2bdb206bc0 is in history

Change-Id: I6583a93047ef962eb14f1a51bc15652cd86bb546
2020-05-21 07:19:03 +00:00
Chalard Jean
34563d72bc [automerger skipped] Add capability they should always have to eth networks. am: 2bdb206bc0 am: 5254e08e73 -s ours am: 47bff53a90 -s ours
am skip reason: Change-Id I6f75e2b26eb9f554243bc418142a4dc18839aa79 with SHA-1 bddcfc0c48 is in history

Change-Id: I5083e03c6bc051bd9bb653f04be54583e64d7768
2020-05-21 07:18:50 +00:00
Chalard Jean
49621f7884 [automerger skipped] Add capability they should always have to eth networks. am: 2bdb206bc0 -s ours am: 269bc92343 -s ours
am skip reason: Change-Id I6f75e2b26eb9f554243bc418142a4dc18839aa79 with SHA-1 2bdb206bc0 is in history

Change-Id: Ibac34cdcae955134769bc6abbb7f8db1ce3546e7
2020-05-21 07:03:02 +00:00
Chalard Jean
786abd27cb Add capability they should always have to eth networks. am: 2bdb206bc0 am: 5254e08e73
Change-Id: Ic4ee8c8eb69754f4aebba6ac0e5b7f447e68a0c1
2020-05-21 07:02:58 +00:00
Chalard Jean
47bff53a90 [automerger skipped] Add capability they should always have to eth networks. am: 2bdb206bc0 am: 5254e08e73 -s ours
am skip reason: Change-Id I6f75e2b26eb9f554243bc418142a4dc18839aa79 with SHA-1 bddcfc0c48 is in history

Change-Id: I9707948cda44ac851338b9172037eadb4d8814ce
2020-05-21 07:02:26 +00:00
Chalard Jean
269bc92343 [automerger skipped] Add capability they should always have to eth networks. am: 2bdb206bc0 -s ours
am skip reason: Change-Id I6f75e2b26eb9f554243bc418142a4dc18839aa79 with SHA-1 bddcfc0c48 is in history

Change-Id: I0e0d9d805cf0474e09790b733fb025627d29e122
2020-05-21 06:42:52 +00:00
Chalard Jean
5254e08e73 Add capability they should always have to eth networks. am: 2bdb206bc0
Change-Id: I52e70815c828a75133f98199e717b6cb15d829f0
2020-05-21 06:42:32 +00:00
Chalard Jean
2bdb206bc0 Add capability they should always have to eth networks.
There is a stopgap hack in ConnectivityService doing
this automatically, but individual agents should be doing
this themselves.

Test: FrameworksNetTests NetworkStackTests
Bug: 150570873
Original-Change: https://android-review.googlesource.com/1307433
Merged-In: I6f75e2b26eb9f554243bc418142a4dc18839aa79
Change-Id: I6f75e2b26eb9f554243bc418142a4dc18839aa79
2020-05-21 05:11:45 +00:00