Commit Graph

564 Commits

Author SHA1 Message Date
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
lucaslin
4a0cbe98c1 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
2021-03-19 15:14:23 +08: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
67226b3778 Use clearAll() of NetworkCapabilities.Builder instead am: df51759103 am: 41bbf4088d am: 1d180b9c76
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1644468

Change-Id: I5568ee3c1ead76a1ea574b44a27117f100946014
2021-03-19 04:28:45 +00:00
lucaslin
1d180b9c76 Use clearAll() of NetworkCapabilities.Builder instead am: df51759103 am: 41bbf4088d
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1644468

Change-Id: I5b5dcf0b5acede05cc2a9b5ad8458ba2d1285cee
2021-03-19 03:44:32 +00: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
cc48bb4c7d [automerger skipped] Merge "Rename StringNetworkSpecifier to Ethernet" am: ddbc35510e am: bdec8758a9 am: 823bab6c17 -s ours
am skip reason: Change-Id I6cba1709b3007a22d95849a1281237c77e1464a4 with SHA-1 12c8111310 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1574261

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic5a350292693c4fb51d0a46ab320e9038f5b7cc3
2021-03-12 00:52:15 +00:00
Remi NGUYEN VAN
823bab6c17 Merge "Rename StringNetworkSpecifier to Ethernet" am: ddbc35510e am: bdec8758a9
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1574261

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifa8fc1fa7c6a8f4d54036a5c6d14f04d8b75fe71
2021-03-12 00:26:45 +00: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
fe13b47721 Merge "[CS09]Remove hidden API usage of NetworkRequest" am: 35a6de8db3 am: a2ef19369c am: 9b8d02047b
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1614966

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9955a29bf9eeb803ff8ffd2d7a3de2e4d943ed50
2021-03-11 17:38:07 +00:00
Frank Li
9b8d02047b Merge "[CS09]Remove hidden API usage of NetworkRequest" am: 35a6de8db3 am: a2ef19369c
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1614966

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If490c51e03538f5e55a576aad54c3d1175830f8b
2021-03-11 16:56:31 +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
Remi NGUYEN VAN
e3b8b8deec Merge "Rename StringNetworkSpecifier to Ethernet" into sc-dev 2021-03-09 22:43:46 +00:00
Remi NGUYEN VAN
12c8111310 Rename StringNetworkSpecifier to Ethernet
The new specifier represents ethernet interfaces more
specifically and is part of the public API.

Bug: 179329291
Test: atest CtsNetTestCases
Change-Id: I6cba1709b3007a22d95849a1281237c77e1464a4
2021-03-08 17:15:43 +09:00
lifr
a2df79da1e [CS07]Remove hidden API usage of NetworkCapabilities am: 89f2f50aee am: 1b5faa9f40 am: 678989b617
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1614962

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8e289c0901ab76ed12d1f84deff3e21c42fe18ce
2021-03-06 18:08:01 +00:00
lifr
678989b617 [CS07]Remove hidden API usage of NetworkCapabilities am: 89f2f50aee am: 1b5faa9f40
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1614962

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4ab997f63ad3e92556da452887f90a238543a362
2021-03-06 17:21:37 +00: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
aad74dd371 [LSC] Add LOCAL_LICENSE_KINDS to frameworks/opt/net/ethernet am: 7909a21be4 am: 0c6adf259a am: 0097c1a9ae
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1589022

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7351ffc17a7c070513a0a9386519eb9359bedf4b
2021-02-16 19:41:21 +00:00
Bob Badour
0097c1a9ae [LSC] Add LOCAL_LICENSE_KINDS to frameworks/opt/net/ethernet am: 7909a21be4 am: 0c6adf259a
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1589022

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I92b1e9daa7eedbb92ece8e6374e60a9229dad1c4
2021-02-16 18:48:25 +00: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
3477857020 [CS02]Remove hidden API usage of NetworkCapabilities am: 810d8f0c94 am: ef49ca71d1 am: 5a4bbfedb2
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1563812

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If118cf5e4eea9eb63f4ca6a5a1b45ea6343ff6eb
2021-02-16 04:13:06 +00:00
lifr
5a4bbfedb2 [CS02]Remove hidden API usage of NetworkCapabilities am: 810d8f0c94 am: ef49ca71d1
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1563812

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I816c3180a72f2f180b62e1e3898e7adb1aca36c5
2021-02-16 03:42:50 +00: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
d6d8698530 Merge "Replace the usage of NetworkManagementService with NetdUtils" am: ab2e555c99 am: 3b3a107f9f am: df0032d32b
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1553695

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5ffdff0a8b5f6b7c44e0b4ce5d5877ce9ea542e8
2021-02-02 05:09:17 +00:00
Lucas Lin
df0032d32b Merge "Replace the usage of NetworkManagementService with NetdUtils" am: ab2e555c99 am: 3b3a107f9f
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1553695

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I45ad93ea268d97f6dbf8ec2f66202d4907c3fe7c
2021-02-02 04:41:36 +00: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
b9f195d64e [VCN07.4] Add NOT_VCN_MANAGED for NetworkAgent implementations am: c8148a18d0 am: 933f907992 am: 50fd33d943
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1563133

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If57bd84c3c469afbb68b36bdb2eac307179f37cf
2021-01-29 22:11:56 +00:00
junyulai
50fd33d943 [VCN07.4] Add NOT_VCN_MANAGED for NetworkAgent implementations am: c8148a18d0 am: 933f907992
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1563133

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2ae6137ced9b3dea6e6a9e91c1c00cbdf10aa588
2021-01-29 21:37:36 +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
46065c428d Fix EthernetTrackerTest#createNetworkCapabilities am: e81b053c1f am: 3c098c26d4 am: ad7cc86898
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1553694

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I19c324ca5c2acf321fc3244cd2a0e31506b90793
2021-01-27 05:35:30 +00:00
lucaslin
ad7cc86898 Fix EthernetTrackerTest#createNetworkCapabilities am: e81b053c1f am: 3c098c26d4
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1553694

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifc07c8d1fba17fe68fe39e78f2ddc4ebfa02d913
2021-01-27 04:59:24 +00: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
92b9f7fed9 [NS01.eth] Remove a useless argument am: be2858b9da am: 292478714f am: fa5ea005b3
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1547575

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieb103c7aa62b3a6a17e8570b9a10e2daf8cc107e
2021-01-12 11:54:27 +00:00
Chalard Jean
fa5ea005b3 [NS01.eth] Remove a useless argument am: be2858b9da am: 292478714f
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1547575

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I01347195ed002e1dcf75e52e7f147095baddaabd
2021-01-12 11:26:35 +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
305c01da15 [automerger skipped] Add TRANSPORT_TEST to test ethernet interfaces am: ecb5efcd76 am: 3340c5cfab -s ours
am skip reason: Change-Id Ife3eab06432cabf3ee626de49abc31c8349b4316 with SHA-1 ecb5efcd76 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/11680681

Change-Id: I53e7022bc37196f34e2deff5d29fa89ca1433a3b
2020-09-16 05:38:46 +00:00