Commit Graph

8690 Commits

Author SHA1 Message Date
Automerger Merge Worker
e4fd7b20db Merge "Add CTS for SocketUtils.makePacketSocketAddress(int, int, byte[])" am: 07fb93026d am: 387bf88d47
Change-Id: I37b07d8d03cc359d18b576856453241a45fc2933
2020-03-11 10:43:39 +00:00
Automerger Merge Worker
387bf88d47 Merge "Add CTS for SocketUtils.makePacketSocketAddress(int, int, byte[])" am: 07fb93026d
Change-Id: Ieb04ad8b9d0d36840d61cf10585672deb797c911
2020-03-11 10:25:04 +00:00
Paul Hu
07fb93026d Merge "Add CTS for SocketUtils.makePacketSocketAddress(int, int, byte[])" 2020-03-11 09:50:26 +00:00
Automerger Merge Worker
ec3c61672e [automerger skipped] Merge "Skip Route tests that are R-specific on Q" into rvc-dev am: 3021e53984 -s ours
am skip reason: Change-Id Ibab9cfae0d35b26c6e4ca0defbb89769b04201d4 with SHA-1 e32fd54cfd is in history

Change-Id: Ib589de21534783aa7a41b59c5c88fb179f49391f
2020-03-11 09:42:52 +00:00
Chiachang Wang
3021e53984 Merge "Skip Route tests that are R-specific on Q" into rvc-dev 2020-03-11 09:36:23 +00:00
paulhu
48dc409d46 Add CTS for SocketUtils.makePacketSocketAddress(int, int, byte[])
Bug: 149426063
Bug: 150640362
Test: atest CtsNetTestCasesLatestSdk:android.net.util.SocketUtilsTest
      on both Q and R devices
Change-Id: I4b5a3dfb78b404d414b7dc358e6f16c3414a8b33
2020-03-11 15:20:26 +08:00
Automerger Merge Worker
8a7f9b575c [automerger skipped] Merge "Merge NetworkStatsService handler changes." into rvc-dev am: a49516676a -s ours
am skip reason: Change-Id If256ed4437ddcbcc72a6f766cff2f4cc512ee3f7 with SHA-1 3239fcbe45 is in history

Change-Id: Ie58da93cd3a7876d8dc56bbcff90bcfd0a38c9d3
2020-03-11 06:36:38 +00:00
Lorenzo Colitti
a49516676a Merge "Merge NetworkStatsService handler changes." into rvc-dev 2020-03-11 06:19:18 +00:00
Automerger Merge Worker
7ea7397f55 [automerger skipped] Merge "Remove framework code that has moved to frameworks/libs/net" am: 5d427c44da -s ours am: 483cdb87ed -s ours
am skip reason: Change-Id Ibf2f370c97a602f186e37ea9ffbe177dd2ee0f1c with SHA-1 21286d2018 is in history

Change-Id: I23421daf88854b4515d8532268afe77dc6ee0ba0
2020-03-11 04:55:24 +00:00
Automerger Merge Worker
483cdb87ed [automerger skipped] Merge "Remove framework code that has moved to frameworks/libs/net" am: 5d427c44da -s ours
am skip reason: Change-Id Ibf2f370c97a602f186e37ea9ffbe177dd2ee0f1c with SHA-1 21286d2018 is in history

Change-Id: I88ef318934572883b59615bd6a1644a5f658842b
2020-03-11 04:35:01 +00:00
Aaron Huang
5d427c44da Merge "Remove framework code that has moved to frameworks/libs/net" 2020-03-11 04:22:09 +00:00
Automerger Merge Worker
e79a15713c Skip Route tests that are R-specific on Q
MTU was added in R so test for it should be run on Q. Also
revise test to adopt rule.

Test: atest CtsNetTestCasesLatestSdk:android.net.LinkAddressTest
      on both devices
Bug: 150918852
Change-Id: Ibab9cfae0d35b26c6e4ca0defbb89769b04201d4
Merged-In: Ibab9cfae0d35b26c6e4ca0defbb89769b04201d4
(cherry picked from commit 09e5726e158d543b7632cd6e22f6e4c29b0bef52)
2020-03-10 12:47:19 +00:00
Automerger Merge Worker
ef05eca5b6 Merge "Skip Route tests that are R-specific on Q" am: 4f95e6c696 am: b6285e1f6a
Change-Id: I1df64580a7e271b6570513cd414f94434822166d
2020-03-10 10:35:53 +00:00
Automerger Merge Worker
b6285e1f6a Merge "Skip Route tests that are R-specific on Q" am: 4f95e6c696
Change-Id: I385fb495bacc26e1959492c53d063409a4e7bf02
2020-03-10 10:28:15 +00:00
Chiachang Wang
4f95e6c696 Merge "Skip Route tests that are R-specific on Q" 2020-03-10 10:24:48 +00:00
Chiachang Wang
e32fd54cfd Skip Route tests that are R-specific on Q
MTU was added in R so test for it should be run on Q. Also
revise test to adopt rule.

Test: atest CtsNetTestCasesLatestSdk:android.net.LinkAddressTest
      on both devices
Bug: 150918852
Change-Id: Ibab9cfae0d35b26c6e4ca0defbb89769b04201d4
2020-03-10 10:24:38 +00:00
Aaron Huang
2a21ea79ab Remove framework code that has moved to frameworks/libs/net
Add srcs to framework and change import path.
Remove the codes which are moved to frameworks/libs/net.

Bug: 139268426
Bug: 135998869
Bug: 138306002
Bug: 143925787
Test: atest FrameworksNetTests
      atest FrameworksTelephonyTests
      ./frameworks/opt/net/wifi/tests/wifitests/runtests.sh
Change-Id: Ia5692aade490fbc8a037186fcdfc453e0dd8045b
Merged-In: Ibf2f370c97a602f186e37ea9ffbe177dd2ee0f1c
2020-03-10 06:45:16 +00:00
Automerger Merge Worker
56fdf66a74 Merge "Add test for getDeprecationTime and getExpirationTime" am: b1bd6a47e4 am: 21286d2018
Change-Id: Ib710d72c9544f3682acda924d2fba60eb379073e
2020-03-10 04:33:33 +00:00
Automerger Merge Worker
21286d2018 Merge "Add test for getDeprecationTime and getExpirationTime" am: b1bd6a47e4
Change-Id: Ibf2f370c97a602f186e37ea9ffbe177dd2ee0f1c
2020-03-10 04:09:18 +00:00
Chiachang Wang
b1bd6a47e4 Merge "Add test for getDeprecationTime and getExpirationTime" 2020-03-10 03:40:55 +00:00
Automerger Merge Worker
e09f28aaf0 Merge "Remove redundant connected notification" into rvc-dev am: 10870e84af
Change-Id: I97eb9fa5e90c9633b59edfda0d591722e9ed9a0c
2020-03-10 02:52:08 +00:00
Lucas Lin
10870e84af Merge "Remove redundant connected notification" into rvc-dev 2020-03-10 02:21:07 +00:00
Automerger Merge Worker
681b23c0f3 [automerger skipped] Merge "Ignore NetworkAgentConfigTest on Q" into rvc-dev am: 8b542f5310 -s ours
am skip reason: Change-Id I5414d7767c39327ff41673ff13ccd34982e10742 with SHA-1 bcef708445 is in history

Change-Id: I2831c60304d7686e5b571700a3c985fa81cdc140
2020-03-10 01:08:44 +00:00
Automerger Merge Worker
352f21648e [automerger skipped] Merge "Skip LinkAddress tests that are R-specific on Q" into rvc-dev am: 2f0b87ab79 -s ours
am skip reason: Change-Id I98b14727eabcf569829eee8df34afc057eba6f93 with SHA-1 6b54308152 is in history

Change-Id: I55760f2faaccb10674d7d12cd0212bbe0686c24b
2020-03-10 01:08:27 +00:00
Automerger Merge Worker
ca8c8a48e8 [automerger skipped] Merge "Ignore testReevaluateNetwork until Q" into rvc-dev am: 7d3cc0e4da -s ours
am skip reason: Change-Id I913b6eaa61bfd4f1964b324dcb4dd272aa8cc583 with SHA-1 8966d31126 is in history

Change-Id: Ib6211a718edf3b1185855c066a305b868dbbc5ac
2020-03-10 01:08:06 +00:00
Remi NGUYEN VAN
8b542f5310 Merge "Ignore NetworkAgentConfigTest on Q" into rvc-dev 2020-03-10 00:59:50 +00:00
Remi NGUYEN VAN
2f0b87ab79 Merge "Skip LinkAddress tests that are R-specific on Q" into rvc-dev 2020-03-10 00:59:32 +00:00
Remi NGUYEN VAN
7d3cc0e4da Merge "Ignore testReevaluateNetwork until Q" into rvc-dev 2020-03-10 00:59:12 +00:00
Automerger Merge Worker
2249d688eb Merge "Clear UIDs when sharing NetworkCapabilties for ConnectivityDiagnostics." am: 52f8ad3e37 am: 4a6123e57b
Change-Id: Ia137b4610408b672cb1e1cdbcdb05a9db2e3c899
2020-03-09 20:16:51 +00:00
Automerger Merge Worker
4a6123e57b Merge "Clear UIDs when sharing NetworkCapabilties for ConnectivityDiagnostics." am: 52f8ad3e37
Change-Id: I1336262b19aaa729fb07410eb9aeeb7869f2f88f
2020-03-09 19:59:18 +00:00
Cody Kesting
52f8ad3e37 Merge "Clear UIDs when sharing NetworkCapabilties for ConnectivityDiagnostics." 2020-03-09 15:12:51 +00:00
Automerger Merge Worker
d697b10390 [automerger skipped] Merge "Remove polling of TetheringManager in ConnectivityManager." into rvc-dev am: 40f27f9454 -s ours
am skip reason: Change-Id I7d88b38eb3d741534e980b7d1e226a411b71fae2 with SHA-1 c24aad5d63 is in history

Change-Id: I4c306f682bb9ea787bf1bfd8f3e17aa15aae9c3e
2020-03-09 09:07:39 +00:00
Automerger Merge Worker
255258f568 Merge NetworkStatsService handler changes.
=====
Remove the need of accessing handler in NSS unit test

Currently, to wait for handler becomes idle, specific message
is used and the test would wait for condition variable to be
open when the message is processed.

However, this is already done in the HandlerUtils. Thus,
there is no need to post such message manually in the handler.

Test: atest FrameworksNetTests
Bug: 150664039

Change-Id: Iab32b2dbab01634ca159dcb90fc9f929d1fed1a2
=====
Remove setHandler in NetworkStatsService

Currently, internal handler is set by setHandler after
constructing NSS object. This was introduced in ag/866187 to
access the handler in the unit test.

However, the design put NSS in a bad situation where all classes
that need handler or executor could not be final and need to be
dynamically allocated in order to get a valid handler.

Thus, since the usage of handler is removed in previous patch,
this change eliminate setHandler by initializing the handler in
the constructor.

Test: atest FrameworksNetTests
Bug: 150664039

Change-Id: I794a24d00b0ca9fdc78091e7b9ab7307e0f034b7
=====

Bug: 150664039
Change-Id: If256ed4437ddcbcc72a6f766cff2f4cc512ee3f7
Merged-In: If256ed4437ddcbcc72a6f766cff2f4cc512ee3f7
(cherry picked from commit 2a6439d7e2a3926e10a0b9a4dc730b1a022d8138)
2020-03-09 07:59:27 +00:00
Chiachang Wang
aae21605af Add test for getDeprecationTime and getExpirationTime
Add for cts coverage for system API

Bug: 139268426
Bug: 135998869
Test: atest FrameworksNetTests
Test: atest CtsNetTestCasesLatestSdk:android.net.LinkAddressTest
Change-Id: I64cd2c914f2da71383af7cdef2cf64c60a7d268c
2020-03-09 06:59:50 +00:00
Automerger Merge Worker
cf31c89275 Ignore testReevaluateNetwork until Q
The method did not exist until Q, so the test is not relevant on such
devices.

Test: atest CtsNetTestCasesLatestSdk:android.net.CaptivePortalTest on Q
          and R devices
Bug: 150918852
Merged-In: I913b6eaa61bfd4f1964b324dcb4dd272aa8cc583
(cherry picked from commit 4d166d7bd95d9582335aafaa03fb242206449054)

Change-Id: I2ddeee53d4ef63f01b791e3e95161194e29d3978
2020-03-09 06:34:01 +00:00
Automerger Merge Worker
f557420d8e Skip LinkAddress tests that are R-specific on Q
Address lifetime was added in R so tests for it should not be run on Q.

Test: CtsNetTestCasesLatestSdk:android.net.LinkAddressTest on both
          devices
Bug: 150918852
Merged-In: I98b14727eabcf569829eee8df34afc057eba6f93
(cherry picked from commit 4e00259d220590acf781382de0542cbae75ec16f)

Change-Id: I9599afa8ae64bb13c93d5f26ebedf3f8dedff6d9
2020-03-09 06:33:28 +00:00
Automerger Merge Worker
a159380357 Ignore NetworkAgentConfigTest on Q
NetworkAgentConfig did not exist on Q.

Test: atest CtsNetTestCasesLatestSdk:android.net.NetworkAgentConfigTest
          on Q and R devices
Bug: 150918852
Merged-In: I5414d7767c39327ff41673ff13ccd34982e10742
(cherry picked from commit d7fedf26d03759cb26a19a6558cf39189b66a681)

Change-Id: I868398148d80afb73659df4d7312f1c2e245ead9
2020-03-09 06:32:14 +00:00
Automerger Merge Worker
9b0c0c61d3 Remove polling of TetheringManager in ConnectivityManager.
Test: manual

Bug: 144742179
Merged-In: I7d88b38eb3d741534e980b7d1e226a411b71fae2
(cherry picked from commit f8a55a19faa938b4e58310f9a90926276b7936ea)

Change-Id: I5cc4231bfb9a0709d677acbb317ee98af31bd041
2020-03-09 06:29:22 +00:00
Automerger Merge Worker
61eccf4a97 Merge "Remove the NetworkScore class." into rvc-dev am: 0c511d4d35
Change-Id: I9849a147d568ecf63a3021f42dada2d745a64876
2020-03-09 06:03:18 +00:00
Automerger Merge Worker
e66badd419 [automerger skipped] Merge "Add more assertions to testStackedLinkProperties." into rvc-dev am: 78c79bec07 -s ours
am skip reason: Change-Id I7d111382be215a926a7d7d4701bd3c3e94372b99 with SHA-1 f82f8533e7 is in history

Change-Id: I9d9754032c5a29d9054348948abf41c0fc279332
2020-03-09 06:02:55 +00:00
Chalard Jean
0c511d4d35 Merge "Remove the NetworkScore class." into rvc-dev 2020-03-09 05:54:30 +00:00
Automerger Merge Worker
8fdca5b977 [automerger skipped] Merge "test: ConnectivityService: Validate Route Add/Del" into rvc-dev am: 50fa7818c1 -s ours
am skip reason: Change-Id I18296b933e856a0f8a4c1dbd75bd35024853bfbb with SHA-1 8fac43038f is in history

Change-Id: Iec5d19ff2ca184cfe0b38976e0817fb0e958ae0d
2020-03-09 05:35:27 +00:00
Automerger Merge Worker
40dda8206b [automerger skipped] Merge "test: LinkProperties: Unique Route Destinations" into rvc-dev am: cfc4030739 -s ours
am skip reason: Change-Id I238899b0643407a1be29eb66d28728ca5d5dbc80 with SHA-1 57cb838bfb is in history

Change-Id: I34004ebf134fa2698b0dd49f2ccc9e341d8bdd97
2020-03-09 05:34:45 +00:00
Automerger Merge Worker
689347b063 Merge "Ignore NetworkAgentConfigTest on Q" am: 45f4fba01a am: 48f016f1d9
Change-Id: I5e2d10bac0a623f92a2fcf58f57865761dfd0ea4
2020-03-09 05:22:45 +00:00
Automerger Merge Worker
ebf8c91fde Merge "Skip LinkAddress tests that are R-specific on Q" am: a7b26b034a am: b9d860e45a
Change-Id: I111cbc2a1c845adb67a80ccb7833784b835190fd
2020-03-09 05:22:31 +00:00
Automerger Merge Worker
427bf0f1ac Merge "Ignore testReevaluateNetwork until Q" am: 27e5d881fc am: 1db2dd223e
Change-Id: Id902b448c0dba503b7701ff3974b6ae8433a0be8
2020-03-09 05:21:49 +00:00
Automerger Merge Worker
48f016f1d9 Merge "Ignore NetworkAgentConfigTest on Q" am: 45f4fba01a
Change-Id: I4626672d2e5e96c7f249f34850f490199d82b06c
2020-03-09 05:12:17 +00:00
Automerger Merge Worker
b9d860e45a Merge "Skip LinkAddress tests that are R-specific on Q" am: a7b26b034a
Change-Id: I9221f3dbe00d9994b73c973cb61a59da7d32b0ac
2020-03-09 05:12:00 +00:00
Automerger Merge Worker
1db2dd223e Merge "Ignore testReevaluateNetwork until Q" am: 27e5d881fc
Change-Id: I0c8c1ecba97100efc49c2ec776af83a60160bd44
2020-03-09 05:11:40 +00:00
Remi NGUYEN VAN
45f4fba01a Merge "Ignore NetworkAgentConfigTest on Q" 2020-03-09 05:03:20 +00:00