Commit Graph

419 Commits

Author SHA1 Message Date
Chiachang Wang
c57eb8c6ad Add null check for the taken callback
The requestTetheredInterface() and releaseTetheredInterface() in
EthernetManager is annotated as @NonNull. Basically, the taken
callback parameter to the service implementation should also be
@NonNull. However, it still possible to use native commands to
call the method in the aidl. If a null callback is taken, it may
cause unexpected results and cause crashes. Add a null check and
throw NPE as a warning.

Bug: 190058445
Test: adb commands
Change-Id: I18fd63aba3f7326597fc3a8c93ba8c9097bf7348
2021-08-20 03:40:29 +00:00
Ady Abraham
089b5546c3 Merge "Revert "Set EthernetNetworkSpecifier on each ethernet network for multi-ethernet"" 2021-08-12 18:16:07 +00:00
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
Treehugger Robot
f7059e69ba Merge "Set EthernetNetworkSpecifier on each ethernet network for multi-ethernet" 2021-08-12 03:13:50 +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
Patrick Rohr
698b59510f Remove Unused Code From EthernetNetworkFactory
Test: atest EthernetNetworkFactoryTest
Change-Id: Ibe0190b3108dca644da2d67bd107954cb26f41ce
2021-07-28 14:22:41 +02:00
Patrick Rohr
e78e8828d6 Add Tests for EthernetNetworkFactory
Test: atest EthernetNetworkFactoryTest
Bug: 191635995
Change-Id: I1c07bb6d30706c4e13002eb402fadfecb97b36d1
2021-07-28 14:22:41 +02:00
Lorenzo Colitti
0b58e409a1 Merge "Stop using LinkPropertiesParcelableUtil." 2021-06-21 09:54:29 +00:00
Lorenzo Colitti
0e077cb1d5 Stop using LinkPropertiesParcelableUtil.
Its methods are all no-ops. Stop using them.

Test: m
Bug: 151052811
Change-Id: Iace3ba898bec2940ec3c3323c5bf8a13627d545f
2021-06-12 00:42:24 +09:00
Chiachang Wang
4bd34bdfba Replace clearAll with withoutDefaultCapabilities in NC#Builder am: bbd8b43c93
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1708167

Change-Id: Ibfd7bab3186ebde177e968ba86962655bee49841
2021-05-17 02:29:35 +00: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
c284d8c380 Add transport type in capabilities filter of EthernetNetworkFacotry am: fe134fbd9c
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1696926

Change-Id: Ib6a6718739976f08797282ed890426e3712693ff
2021-05-07 08:29:54 +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
335e3d7e70 Remove hidden connectivity methods usage in ethernet test am: 58e0c49c2e
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1675425

Change-Id: I12c4e276c23bf73cd5642f088c029fc1d57ff6e3
2021-04-14 16:54:52 +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
4e4a67cf63 Use public API instead of hidden API in EthernetTracker am: 19b7b3dfbd
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1649303

Change-Id: I55ce6d9e45e35629e1b50eed9fb1ea4acb64f564
2021-03-25 08:42:29 +00: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
801dad1d42 Replace reference of NetworkAgent#setLegacyExtraInfo am: c439eae5b4
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1645031

Change-Id: Ie9fb99ada7c78db35a066d5a01d69c0dcadcc232
2021-03-19 08:37:11 +00:00
junyulai
a340a23572 Replace references of request.networkCapabilies am: 89764da132
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1645030

Change-Id: Iee8a2e8a18b2a91deb8d1c6f67a295de757c369d
2021-03-19 08:30:20 +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
41bbf4088d Use clearAll() of NetworkCapabilities.Builder instead am: df51759103
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1644468

Change-Id: I67aeae2090ba3bc8d6026c0164368d61743c68cd
2021-03-19 03:17:21 +00: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
bdec8758a9 Merge "Rename StringNetworkSpecifier to Ethernet" am: ddbc35510e
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1574261

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I59ab3a88f7524cc75258406cd3e09d3872b01bf1
2021-03-12 00:10:08 +00:00
Remi NGUYEN VAN
ddbc35510e Merge "Rename StringNetworkSpecifier to Ethernet" 2021-03-11 23:51:49 +00:00
Frank Li
a2ef19369c Merge "[CS09]Remove hidden API usage of NetworkRequest" am: 35a6de8db3
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1614966

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic83936b2d702bb77c166b2494f70e26a2f62824d
2021-03-11 16:37:51 +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
1b5faa9f40 [CS07]Remove hidden API usage of NetworkCapabilities am: 89f2f50aee
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1614962

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0e5b3ad03250e6afebbace7ff5b6431d136bfd0a
2021-03-06 16:45:37 +00: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