Commit Graph

7315 Commits

Author SHA1 Message Date
Iavor-Valentin Iftime
70001b0aca Merge "API to detect which network interfaces support wake-on-lan"
am: 1d47b3ab03

Change-Id: I6239ae68559290e31f8c9384e0f973cfea30a1c7
2019-10-08 08:23:23 -07:00
Iavor-Valentin Iftime
1d47b3ab03 Merge "API to detect which network interfaces support wake-on-lan" 2019-10-08 15:08:18 +00:00
Valentin Iftime
a039e57ead API to detect which network interfaces support wake-on-lan
Add a new method in LinkProperties, isWakeOnLanEnabled() which returns
true if network interface is defined in config_wakeonlan_enabled_interfaces
string-array (config.xml)

Bug: 132705025
Test: atest LinkPropertiesTest & atest ConnectivityServiceTest
Change-Id: I3f7803aafd2f8eaf8aa18419b21339e15d4b7a0b
2019-10-08 13:03:30 +02:00
Roshan Pius
bc1ff193a2 Merge "ConnectivityService: Grant networkstack uid extra privileges"
am: 0bb25f4be7

Change-Id: I1bdf4e65fc11a6528818d53e3034c883b2ef8c8b
2019-10-07 20:37:50 -07:00
Treehugger Robot
0bb25f4be7 Merge "ConnectivityService: Grant networkstack uid extra privileges" 2019-10-08 03:12:58 +00:00
Chalard Jean
5420ad47ea Merge "Rename CallbackRecord to CallbackEntry"
am: 63fea675c7

Change-Id: Ibfe98cf26ee65711b5366edfc5d95e64dcfec266
2019-10-06 22:39:47 -07:00
Chalard Jean
63fea675c7 Merge "Rename CallbackRecord to CallbackEntry" 2019-10-07 05:28:57 +00:00
Chalard Jean
f7edecb54a Rename CallbackRecord to CallbackEntry
Test: FrameworkNetTests NetworkStackTests
Change-Id: I8f6ea8fb6879cf7c40396d92f13cb5e12cc45ee7
2019-10-07 13:00:50 +09:00
Roshan Pius
111b1b00cc ConnectivityService: Grant networkstack uid extra privileges
The wifi network factories/agents are going to run in the network stack
process for devices which accept wifi mainline module. Allow these
factories/agents to perform privileged operations.

Bug: 142115344
Test: ACTS test
Change-Id: I2dd412ac5c6b67f52c87113fcda345e1f531f9c4
WifiNetworkRequestTest:test_connect_failure_user_rejected passes now.
(cherry-picked from c7580b1d59ee126cd6867cb6fe4485a69e2b4622)
2019-10-06 14:32:19 -07:00
Chalard Jean
d8b3b06742 Merge "Decrease load-related flakiness in ConnectivityServiceTest"
am: cc1381518d

Change-Id: I22cf33a9eff84c07706d284499f87b5bd4ac157b
2019-10-01 19:55:46 -07:00
Chalard Jean
cc1381518d Merge "Decrease load-related flakiness in ConnectivityServiceTest" 2019-10-02 02:38:30 +00:00
Chalard Jean
e0322987da Merge "Opportunistic cleanup"
am: 493f8c38bf

Change-Id: I5ac4ae5f941e741a88c595ae5f12b804a758abe6
2019-09-30 22:38:25 -07:00
Chalard Jean
493f8c38bf Merge "Opportunistic cleanup" 2019-10-01 05:25:57 +00:00
Chalard Jean
bb3e64fdc5 Opportunistic cleanup
Test: FrameworksNetTests NetworkStackTests
Change-Id: I370ad15fb0d8301f9720caf5296365c04aebeb62
2019-09-30 19:12:25 +09:00
Chalard Jean
5ea0f921bb Decrease load-related flakiness in ConnectivityServiceTest
Almost always this timeout is not waited anyway.

Test: ConnectivityServiceTest
Change-Id: I74376633d0ec8d93fb48609a4df73cad5fc5d508
2019-09-27 21:44:54 +09:00
Lorenzo Colitti
9b5daf2034 Merge "Properly test TrafficController permissions on package updates."
am: 038d906ac8

Change-Id: Ia6d480739fadaa7b3277d9b6e9abc303b8e551b4
2019-09-26 22:48:57 -07:00
Treehugger Robot
038d906ac8 Merge "Properly test TrafficController permissions on package updates." 2019-09-27 05:35:25 +00:00
Chalard Jean
1f31fe7f98 Merge "Fix TestNetworkAgentWrapper flakiness"
am: 9f0dc317cc

Change-Id: I7a20018464b1df7399fd093d2b3259aeb0bca194
2019-09-25 02:16:15 -07:00
Chalard Jean
9f0dc317cc Merge "Fix TestNetworkAgentWrapper flakiness" 2019-09-25 08:58:34 +00:00
Oscar Shu
f59fb89406 Merge "Followup to CL 1103896"
am: e4713e7f18

Change-Id: I1eb784a8266880260d75ca109c7d78f180333a0e
2019-09-24 15:28:23 -07:00
Oscar Shu
e4713e7f18 Merge "Followup to CL 1103896" 2019-09-24 22:06:27 +00:00
xshu
6aa877983e Followup to CL 1103896
Optimizes the logic that ensures the default randomized MAC is not
returned.

Bug: 137796328
Test: atest MacAddressTest
Change-Id: Ie95d7a020bfac8850b8a67e4d396de77db22e1db
2019-09-20 16:56:54 -07:00
Chalard Jean
4e9ecc6f34 Fix TestNetworkAgentWrapper flakiness
The underlying issue here is that before aosp/986824 the call to
waitForIdle is the local ConnectivityServiceTest function, but
after that patch TestNetworkAgentWrapper has an identically
named member that only wait for its own handler.

Bug: 141341704
Test: ConnectivityServiceTest --generate-new-metrics 100
Change-Id: I38709cc69ec7a261c1c6e008abe03d2882e2083d
2019-09-20 17:19:31 +09:00
Lorenzo Colitti
aa639e4ce8 Properly test TrafficController permissions on package updates.
The current test we have for a package changing TrafficController
permissions (i.e., INTERNET or UPDATE_DEVICE_STATS permissions)
is not realistic.

This is because the test simulates the update by removing and
adding the package. But TrafficController permissions are not
driven by broadcasts, they are driven by PackageListObserver,
and when an app is updated, PackageListObserver does not see a
remove and and add, but a single change event.

Add a new test for this.

Bug: 137864893
Test: new unit test added
Change-Id: I691b928f57c79c19dfb6ddb01983d55ef305c472
2019-09-20 11:58:43 +09:00
TreeHugger Robot
a32c176936 Merge "Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master" into stage-aosp-master 2019-09-11 20:31:32 +00:00
Steven Moreland
b3873361d5 Merge "Remove libhwbinder/libhidltransport deps"
am: 32f968b767

Change-Id: I196f0ec3f1c3bcafc50c21f34774b089025eb046
2019-09-10 16:45:26 -07:00
Xin Li
01d1f3942f Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
Bug: 135460123
Change-Id: I65906d82b14125c0893d5cde0cfebb73bf9e38ab
Merged-In: I1f2564837c33cd4c6c3db6aac3cbaf8c09707da9
2019-09-10 11:16:29 -07:00
Steven Moreland
ff493b1344 Remove libhwbinder/libhidltransport deps
Since these were combined into libhidlbase.

Bug: 135686713
Test: build only (libhwbinder/libhidltransport are empty)
Change-Id: I136e4d4459bb8c3c5abf3c0758dd5ae14d0ad2a2
2019-09-09 16:28:55 +00:00
Xin Li
cadfd1f6b1 [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master"
am: 3e350bb864 -s ours
am skip reason: subject contains skip directive

Change-Id: I47d5e62a09155529525a892c1687519f054d43f9
2019-09-05 14:18:24 -07:00
Xin Li
1166014e6c [automerger skipped] DO NOT MERGE - Merge Android 10 into master
am: 0eee7b5d83 -s ours
am skip reason: subject contains skip directive

Change-Id: I2fad02a5d974eb5bef685a9c695eb52f52f8749a
2019-09-05 13:26:43 -07:00
Xin Li
3e350bb864 Merge "DO NOT MERGE - Merge Android 10 into master" 2019-09-05 16:53:23 +00:00
Lucas Lin
c8eaa3f08d Merge "Fix flaky test - testPartialConnectivity"
am: f4aa4861e0

Change-Id: Ic643ec7a5641b531befc8a9c4af524177f97e761
2019-09-05 05:09:48 -07:00
Lucas Lin
f4aa4861e0 Merge "Fix flaky test - testPartialConnectivity" 2019-09-05 11:40:01 +00:00
lucaslin
e2bfa65a04 Fix flaky test - testPartialConnectivity
This timing issue is happened when test case already verified
NetworkMonitor#setAcceptPartialConnectivity() before
NetworkAgent send the CONNECTED state to ConnectivityService.
This test case expects that the
NetworkMonitor#setAcceptPartialConnectivity() will be invoked
when network state is CONNECTED in
ConnectivityService#updateNetworkInfo().

NetworkAgent communicates with ConnectivityService by
AsyncChannel. Before they connect to each other, the thread of
NetworkAgent is keeping idle, so waitForIdle cannot handle this
kind of case. Although they have connected to each other, but
they don't communicate with each other, waitForIdle() still
cannot handle this case. It means waitForIdle() can only handle
the case that NetworkAgent already connected to
ConnectivityService and NetworkAgent is communicating with
ConnectivityService. So, that's why waitForIdle() sometimes
doesn't work in this case, and the most simplest and right way
to fix this case is to wait the available callback then verify
the method.

Bug: 140306320
Test: atest FrameworksNetTests: \
      ConnectivityServiceTest#testPartialConnectivity \
      --generate-new-metrics 500

Change-Id: I64bfecbfe3c5776bd5c347a821f9127e79539c48
2019-09-05 11:39:20 +00:00
Remi NGUYEN VAN
b050eabb3f Merge "Add NetIdManagerTest"
am: 4339cf3402

Change-Id: Ifbebb446601fcbbdf91fff48dc66ad173a6ecc7c
2019-09-04 23:54:58 -07:00
Remi NGUYEN VAN
71df7f558a Merge "Add ConnectivityServiceIntegrationTest"
am: 324d724fd7

Change-Id: Ib82c5e5aee9e830a0efe8ea6335933237bb33856
2019-09-04 22:41:44 -07:00
Xin Li
0eee7b5d83 DO NOT MERGE - Merge Android 10 into master
Bug: 139893257
Change-Id: I9e3c4fe5406c9913d50fe3b07d7f7cef7a246b96
2019-09-04 13:33:59 -07:00
Remi NGUYEN VAN
f3ba3cd27b Add NetIdManagerTest
Add a simple test to verify that IDs loop correctly, that they skip used
IDs correctly, and throw when there is no remaining ID.

Test: atest com.android.server.NetIdManagerTest
Change-Id: I4c9518c725156d743286e062fd2eec1423a0459e
2019-09-04 15:57:58 +09:00
Remi NGUYEN VAN
ebe5298d84 Add ConnectivityServiceIntegrationTest
This test exercises the Connectivity <-> NetworkMonitor integration.
This CL only contains a simple test (network validates), but more
generally it sets up a test package that contains both services.jar
classes and NetworkStack classes, and runs NetworkStack components in
another process (using TestNetworkStackService).

ConnectivityServiceIntegrationTest runs in the test process and binds to
TestNetworkStackService to obtain TestNetworkStackConnector and to
NetworkStackInstrumentationService to obtain
NetworkStackInstrumentationConnector. That last connector allows the
test to mock NetworkMonitor HTTP Requests.

Test: atest FrameworksNetIntegrationTests
Change-Id: Ieca18e273609044cf6b1870d2f0dba33ca7b38d3
2019-09-04 15:57:47 +09:00
Guang Zhu
4416eecc3a Merge "Mark 3 tests as flaky."
am: f6c61f329a

Change-Id: Ie1c38e247ccfaa407d35cf6b6e28306d36cdccca
2019-09-02 12:03:12 -07:00
Treehugger Robot
f6c61f329a Merge "Mark 3 tests as flaky." 2019-09-02 18:44:24 +00:00
Guang Zhu
6665297de9 Mark 3 tests as flaky.
Bug: 140306320
Bug: 140305589
Bug: 140305678
Test: apct/net/networking_framework_unit_test
Change-Id: I5a288d7d64b3e95e0025c2c1f4a64ffe85cc3cd6
2019-09-01 21:37:04 -07:00
Aurimas Liutikas
97d561c8fd [automerger skipped] Merge "Add missing nullability annotations."
am: 79373f74cd -s ours
am skip reason: change_id I109260842cfc25f06e40694997fcbb4afa02c867 with SHA1 9242b6de9c is in history

Change-Id: I7b2712e4ab3635f94f8257d88f24c20bc68a3ac0
2019-08-30 11:49:09 -07:00
Aurimas Liutikas
79373f74cd Merge "Add missing nullability annotations." 2019-08-30 18:30:39 +00:00
Paul Hu
e8db073053 Merge "Fix flaky testTcpBufferReset"
am: 97d1b8cec7

Change-Id: Ia344cb1a8c0be07a62eac98117911b6cdb329525
2019-08-30 09:19:42 -07:00
Paul Hu
97d1b8cec7 Merge "Fix flaky testTcpBufferReset" 2019-08-30 16:01:45 +00:00
junyulai
2e15c3578a Merge "Fix LockdownVpnTracker deadlock when resetting legacy Always-On VPN"
am: c07aed0fd4

Change-Id: If5b3f6f1d397d3ac35b509a2e634a60933f2df6c
2019-08-30 08:30:10 -07:00
Aurimas Liutikas
7958bb6ac8 Merge "Add missing nullability annotations." into stage-aosp-master 2019-08-30 15:19:45 +00:00
paulhu
ce03e08054 Fix flaky testTcpBufferReset
If EVENT_NETWORK_INFO_CHANGED was handled after waitForIdle()
method done, this test will be failed due to
INetd#setTcpRWmemorySize() was not executed yet. Instead of
waiting for idle state, it's better to use NetworkCallback to
ensure events completely on ConnectivityService.

Bug: 140206578
Test: atest ConnectivityServiceTest#testTcpBufferReset\
      --generate-new-metrics 500

Change-Id: Iad77415db38038603881d9ebe0e37586b549a45c
2019-08-30 20:21:03 +08:00
junyulai
2bdd029792 Fix LockdownVpnTracker deadlock when resetting legacy Always-On VPN
When resetting legacy Always-On VPN, the intent is handled by
main thread. And it will also initialize VPN shutdown process,
which will cause networkInfo changed event on
ConnectivityService internal thread. These two events need to
hold their corresponding lock and ask for the other one, which
causes the deadlock.

This patch move the event handling to the same thread to prevent
such deadlock, and cleanup some unused variables.

Change-Id: I5b656c0d0381acb4e33409a11f502db9b180296c
Fix: 139122208
Test: atest FrameworksNetTests, manual test
2019-08-30 19:56:59 +08:00