Commit Graph

279 Commits

Author SHA1 Message Date
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
paulhu
3056b7418b Enforce ACCESS_NETWORK_STATE to getAvailableInterfaces()
getAvailableInterfaces() will return available ethernet
interfaces which are the information about networks. So it should
enforce ACCESS_NETWORK_STATE permission check to ensure the
applications are allowed to access the information.

Bug: 174573778
Test: TetheringTests
Test: CtsTetheringTest
Change-Id: I7aaa5225d56f2feecc51ba263489ed0ce02fd651
2021-04-26 06:05:39 +00:00
lucaslin
4450c1542b Add transport type in capabilities filter of EthernetNetworkFacotry
Bug: 167544279
Test: atest EthernetServiceTests
Change-Id: Ie64e3cff0ace413f14682736de7a1b65fa93e705
2021-03-30 16:54:45 +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
Lucas Lin
06e1c17103 Merge "Use public API instead of hidden API in EthernetTracker" into sc-dev 2021-03-19 11:23:01 +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
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
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
ab2e555c99 Merge "Replace the usage of NetworkManagementService with NetdUtils" 2021-02-02 03:38:37 +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
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
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
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
Chalard Jean
bddcfc0c48 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
Change-Id: I6f75e2b26eb9f554243bc418142a4dc18839aa79
2020-05-11 11:21:15 +09:00
Chalard Jean
4b9a7dd13d Address further API council comments.
Test: FrameworksNetTests NetworkStackTests
Bug: 152238712
Copy from ag/10857997
Change-Id: I7c27f76c54a76abeae46dcdcddaeb3ca48afa358
Merged-In: I7c27f76c54a76abeae46dcdcddaeb3ca48afa358
2020-04-01 11:04:18 +00:00
Chalard Jean
86aac0daec Convert the Ethernet factory to the new network agent
This is a combination of ag/10147368 and ag/10438581.
ag/10147368 implemented this conversion together with
using the planned NetworkScore API, while ag/10438581
reverted the parts that had to do with NetworkScore.
This is just a squash of these two patches and it
brings the factory in line with the code in rvc-dev.

Test: FrameworksNetTests NetworkStackTests EthernetTetheringTest
Change-Id: Ib214fbbd042f2c0ebd01cf5b0ec33d922629677e
Merged-In: Ie7b70750ef0e17141080f4266dea6155c3601569
2020-04-01 09:09:32 +00:00
Lorenzo Colitti
dd397f58c7 Fix querying Ethernet availability for unprivileged callers.
Both EthernetManager#getAvailableInterfaces() and the no-arg
version of EthernetManager#isAvailable() end up calling
EthernetServiceImpl#getAvailableInterfaces. This method attempts
to filter out restricted interfaces if the caller does not have
the CONNECTIVITY_USE_RESTRICTED_NETWORKS permission.

Unfortunately EthernetNetworkFactory's notion of a restricted
interface is the opposite of what it should be. This means that
while privileged callers can see all interfaces, unprivileged
callers can only see restricted interfaces which they cannot use.

Fix this by correcting NetworkInterfaceState#isRestricted(), so
that unprivileged callers can see only unrestricted interfaces.
Privileged callers are unaffected.

This bug probably went unnoticed because restricted Ethernet
interfaces are rare (likely used only on auto devices) and
because the callers that care about those restricted interfaces
are generally privileged.

Bug: 148824036
Test: atest android.net.EthernetTetheringTest#testPhysicalEthernet
Change-Id: Idff3b05a193a80c581d80d0e4fe9c2d3fc0d8a25
2020-03-26 22:53:10 +09:00
Lorenzo Colitti
bd66333a24 Don't call maybeTrackInterface on the wrong thread.
Bug: 150644681
Test: atest TetheringIntegrationTests:EthernetTetheringTest --rerun-until-failure 100
Change-Id: Ia2cb265f8d4de96210f1462339c10ad2947eec65
2020-03-26 17:02:27 +09:00
Lorenzo Colitti
165b456d92 Send tethered interface callbacks based on interface existence.
Currently, callbacks for tethered interface availability are sent
based on interface link state. This is incorrect:

- It is acceptable and expected to be able to enable tethering on
  an interface that does not yet have link up.
- It doesn't seem useful to disable Ethernet tethering if link
  temporarily goes down.

Instead, only base the callbacks on whether an interface exists
or not.

Bug: 150644681
Test: WIP tests in aosp/1260100 pass
Change-Id: I015219cbd03626c38fb5156d0cb2991ba7d7def7
2020-03-19 22:12:32 +09:00
Lorenzo Colitti
e81f99d532 Support setting the default interface to null again.
Currently, the default interface can only ever go from null to
non-null. This is correct for fixed interfaces (because they
don't get unplugged) and it's generally correct for USB
interfaces that use ethX as their device name (because when
they are unplugged and plugged in again, the device name won't
change). But it is not correct if, for example, the default
interface is a test interface. So, allow mDefaultInterface to go
back to null.

This CL also fixes a crash if a tethered interface request is
added and removed when there is no default interface.

Also, make dump() report tethered interface requests.

Also remove an unused variable that I missed in the previous CL.

Bug: 150644681
Test: tested by EthernetTetheringTest in same topic
Change-Id: I5109d8da3aeb6c1f6523291d9e2ec92c64b5ad2d
2020-03-19 22:04:23 +09:00
Lorenzo Colitti
841195a103 Make Ethernet interfaces more testable.
This CL adds a setIncludeTestInterfaces method to EthernetManager
that, when called, causes the Ethernet service to recognize and
manage test interfaces created by TestNetworkManager.

Bug: 150644681
Test: Tested by EthernetTetheringTest in same topic
Change-Id: I86eef7a93267f800dbfc8eafd307effa76a344ca
2020-03-19 18:06:59 +09:00
Milim Lee
f85c0b301c Set Ethernet default mode as CLIENT
Bug: 130840861
Test: build, boot
      atest EthernetTrackerTest
      manual test (using Ethernet)

Change-Id: I935ea2e5f214aced67fb60f4aec2744077177545
2020-02-01 05:48:53 +09:00
Lorenzo Colitti
32327808e1 Support one Ethernet interface in server mode.
Currently, Ethernet only supports interfaces in client mode
(e.g., to connect to the Internet). Add minimal support to
Ethernet to support interfaces in server mode. This simple
implementation only works on the default interface, which is the
first interface that is detected on boot (even if the interface
is later removed).

This also provides (but does not yet unhide) a simple API for
Tethering to request that the next-plugged-in interface to be
placed into server mode.

Test: Enabling tethering with change on top
Bug: 130840861
Merged-In: I78f85bc36aaceb62ce274003a75ea99d0b6bc8b7
Change-Id: I78f85bc36aaceb62ce274003a75ea99d0b6bc8b7
(clean cherry-pick from internal branch)
2020-01-28 16:22:46 +09:00
Lorenzo Colitti
918f68fce9 Merge "Avoid creating IpClient if ethernet cable is unplugged." 2020-01-09 05:26:34 +00:00
Junaid Babu
b92d1f5513 Fix refCount check at releaseNetworkFor
When releaseNetworkFor is called, refCount should be equal to 1 for
network.stop() to be called. This is the same logic that is followed by
WifiNetworkFactory also.
In the current code, when refCount is 2 and releaseNetworkFor() is called,
network.stop() will be executed and will stop Ethernet

Bug: 146089778
Test: build and boot OK
Change-Id: Ib7d1b488a2943364a8ba4a89eec5de4c33cf1d5a
2019-12-17 15:09:01 +09:00
kevinwk_lee
13d5b86614 Avoid creating IpClient if ethernet cable is unplugged.
This change avoids calling start() on needNetworkFor() if ethernet
cable is unplugged. Fixed by adding isLinkUp validation.

Test: ./cts-tradefed run cts-dev -d -m CtsSecurityTestCases -t \
      android.security.cts.ListeningPortsTest#testNoRemotelyAccessibleListeningUdpPorts
      adb shell netstat -lnup

Change-Id: I2debd7367a20b665249f9c19d2d8a61737435803
2019-10-31 07:23:11 +00:00
Paul Hu
cd73c22c96 Merge "[Ethernet] Replace internal connectivity checks permission" 2019-09-20 07:23:07 +00:00
Chalard Jean
91456a8c7a Update Ethernet code for the NetworkFactory serial number.
See aosp/708790

Bug: 18637384
Bug: 29030667
Test: manual
      cts
      runtest framework-net
      atest frameworks/opt/net/ethernet/tests

Change-Id: I5caa4cb89ca1441f3c84b5675ceede6ecacfd132
2019-09-09 11:03:51 +08:00
paulhu
6957e3a35a [Ethernet] Replace internal connectivity checks permission
A number of connectivity checks that protect system-only methods
check for CONNECTIVITY_INTERNAL, but CONNECTIVITY_INTERNAL is a
signature|privileged permission. We should audit the permissions
checks, and convert checks that protect code that should not be
called outside the system to a signature permission. So replace
the permission to NETWORK_STACK.

Bug: 32963470
Test: atest EthernetServiceTests
Change-Id: I2a88d04bbdcd7e7e624b9065372a6603d2bb45a2
2019-08-22 16:03:59 +08:00
Wally Yau
b95be5972e Fixed fatal exception in EthernetServiceThread
When this.mIpConfig is not initialized, it will cause a
java.lang.NullPointerException and put the device in a boot
loop with the following error:

FATAL EXCEPTION IN SYSTEM PROCESS: EthernetServiceThread

Test: passed pre-submit boot test.

Change-Id: I47df68071b4c07a4136c0abcbe69ee7ada7090e0
2019-05-29 14:50:38 -07:00
tank.hung
f8a95e543f Add reconnect flow when updateIPConfiguration
Bug: 119085164
Test: manual, test with AndroidTV device

Partner gerrit review CL:
https://partner-android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1215654

[Analysis]
APP called EthernetManager.setConfiguration API for switch DHCP to
Static,
setConfiguration’s flow just only update IpConfig finally but have not
trigger EthernetNetworkFactory.start().
So Static IP Setting just only take effect when unplug/plug Ethernet
Cable or AC Off&On.

[Repeat Steps]
1. Connect Ethernet with DHCP and Network access is normal
2. Change IP settings from DHCP to Static and set Static IP.
3. After setting, you can not automatically obtain Static IP.

[Recovery Method]
Unplug the Ethernet and insert it or AC OFF / ON

Change-Id: Idbb6a24ccfa360582f48e4f9369def7fc729fb9f

Bug: 112171349
2019-05-14 15:16:19 +00:00
Sal Savage
ea26baf9ff Update comments and documentation in net type prop change
Bug: b/112588045
Test: atest EthernetServiceTests --verbose
Test: kitchensink, dumpsys ethernet, with RPi devices and USB to
      ethernet adapters.

Change-Id: Iaa260aabbbd7aa4b7864eba32ecff7e3f84123c3
2019-03-25 14:11:20 -07:00
Remi NGUYEN VAN
5060d1d1be Migrate EthernetNetworkFactory to IIpClient
Test: atest EthernetServiceTests
Bug: b/112869080
Change-Id: I54f32d3031e63c7dea78936b6fe5e83e5b293c33
2019-01-25 12:34:03 +09:00
Sal Savage
d3a5c0404c Allow network transport type override
Bug: b/112588045
Test: atest EthernetServiceTests --verbose
Test: kitchensink with RPi devices connected by USB -> Ethernet
      adapters. Edit config.xml to try different tranport
      overrides manually. Use dumpsys ethernet to show final
      final network scores.
Change-Id: I482e78a76d06c9c090aa6816db14bb346eb6528b
2019-01-15 11:56:50 -08: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
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
153ef57146 Tiny tiny style fix
Test: none needed
Change-Id: Ic6cfedf9cfe60984ce7fbd59bdaec55b0bba3001
2018-08-21 18:18:41 +09: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
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
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
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
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