Commit Graph

7329 Commits

Author SHA1 Message Date
Jimmy Chen
5cec9c17ec Merge "p2p: mirgrate p2p into tethering modes"
am: 05727ec32d

Change-Id: Ib8f43d77a5f57965fa217e6e92eb9773e7914b54
2019-10-17 23:06:04 -07:00
Jimmy Chen
05727ec32d Merge "p2p: mirgrate p2p into tethering modes" 2019-10-18 05:42:31 +00:00
Aaron Huang
623f385dc8 Merge "Expose MacAddress methods to public API"
am: c54645390f

Change-Id: I98c2104fe5307e916bd2026eb943bfe4a9913d07
2019-10-17 20:55:36 -07:00
Aaron Huang
c54645390f Merge "Expose MacAddress methods to public API" 2019-10-18 03:45:40 +00:00
Lucas Lin
0509d84915 Merge "Remove the network capabilities which are added twice"
am: 931234b451

Change-Id: I884dd7720ef9ccf257dc49de11a24918c00fa0ca
2019-10-15 21:23:48 -07:00
Aaron Huang
fd39026749 Expose MacAddress methods to public API
To support mainline modules, adding the methods which
are used by wifi.

Bug: 139268426
Bug: 135998869
Bug: 138306002
Test: atest android.net.cts
      atest android.net.wifi.cts
      atest FrameworksNetTests
      atest NetworkStackTests
      ./frameworks/opt/net/wifi/tests/wifitests/runtests.sh

Change-Id: I49856863c15b6b3b59aa867a77b0f137003149ef
2019-10-15 17:33:05 +08:00
lucaslin
cc85ff9fa3 Remove the network capabilities which are added twice
Remove the network capabilities which are added twice in
createDefaultNetworkCapabilitiesForUid() and
createDefaultInternetRequestForTransport(). In the constructor
of NetworkCapabilities, it will add the DEFAULT_CAPABILITIES
which includes the NOT_RESTRICTED.

Bug: 142370233
Test: 1. Build pass.
      2. atest FrameworksNetTests
Change-Id: I7159909aec8faa7f25cef94195bdaea0fea55840
2019-10-15 17:13:45 +08:00
paulhu
382568d4bc Merge "Remove @FlakyTest on testTcpBufferReset"
am: 23d3603ab8

Change-Id: I3078d75cdc1ec6a1ddbd10de60cb6d355fe5f317
2019-10-11 04:26:47 -07:00
Treehugger Robot
23d3603ab8 Merge "Remove @FlakyTest on testTcpBufferReset" 2019-10-11 11:06:14 +00:00
Chalard Jean
a6916097ee Merge "Improve documentation for NetworkCallbacks."
am: f34bdd0f74

Change-Id: I7384a0224bdf3fe86aee3733d4b7a6e5e12b5a4e
2019-10-09 23:14:30 -07:00
Chalard Jean
f34bdd0f74 Merge "Improve documentation for NetworkCallbacks." 2019-10-10 05:56:59 +00:00
Chalard Jean
7f3a8746c3 Improve documentation for NetworkCallbacks.
Bug: 139570489
Test: m doc-comment-check-docs
Change-Id: I9e13057b7e46908863156986429ff2ce93d4be78
2019-10-09 18:33:09 +09:00
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
Jimmy Chen
87db154b42 p2p: mirgrate p2p into tethering modes
Bug: 137602441
Bug: 139783330
Test: atest FrameworksNetTests
Test: atest FrameworksWifiTests
Test: CtsVerifier - Wi-Fi Direct
Test: Enable hotspot when P2P GO is running
      * P2P GO is terminated
      * hotspot is running
Test: Enable P2P GO when hotspot is running
      * hotspot is intact
      * P2P GO could not be launched
Test: Verify P2P functions with legacy WifiP2pService

Change-Id: Icb2e2b106ae52b19af29b7a1ebc55d3cdf80db9c
2019-10-08 14:37:19 +08: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
paulhu
3099fe24ef Remove @FlakyTest on testTcpBufferReset
After aosp/1111617 merged, the test pass rate of
testTcpBufferReset is 100% on Android Test Metrics. That means
this test is not flaky. So remove @FlakyTest annotation on the
test.

Change-Id: I1fb47a9fda294030c41dc53cf4bac3849a2f3d54
Fix: 140305678
Test: atest ConnectivityServiceTest#testTcpBufferReset
2019-09-10 17:44:33 +08: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