Commit Graph

8683 Commits

Author SHA1 Message Date
Automerger Merge Worker
5f2dfcadbf [automerger skipped] Merge "Merge NetworkStatsService handler changes." into rvc-dev am: f25e167d93 -s ours
am skip reason: Change-Id If256ed4437ddcbcc72a6f766cff2f4cc512ee3f7 with SHA-1 010eaf890e is in history

Change-Id: Ie58da93cd3a7876d8dc56bbcff90bcfd0a38c9d3
2020-03-11 06:36:38 +00:00
Lorenzo Colitti
f25e167d93 Merge "Merge NetworkStatsService handler changes." into rvc-dev 2020-03-11 06:19:18 +00:00
Automerger Merge Worker
7751b7f655 [automerger skipped] Merge "Remove framework code that has moved to frameworks/libs/net" am: 73808bd4cf -s ours am: 96a23bf0db -s ours
am skip reason: Change-Id Ibf2f370c97a602f186e37ea9ffbe177dd2ee0f1c with SHA-1 9d279abf30 is in history

Change-Id: I23421daf88854b4515d8532268afe77dc6ee0ba0
2020-03-11 04:55:24 +00:00
Automerger Merge Worker
96a23bf0db [automerger skipped] Merge "Remove framework code that has moved to frameworks/libs/net" am: 73808bd4cf -s ours
am skip reason: Change-Id Ibf2f370c97a602f186e37ea9ffbe177dd2ee0f1c with SHA-1 9d279abf30 is in history

Change-Id: I88ef318934572883b59615bd6a1644a5f658842b
2020-03-11 04:35:01 +00:00
Aaron Huang
73808bd4cf Merge "Remove framework code that has moved to frameworks/libs/net" 2020-03-11 04:22:09 +00:00
Automerger Merge Worker
65f82b85cd Merge "Skip Route tests that are R-specific on Q" am: 3e3abc9ec4 am: 65ffa79f4a
Change-Id: I1df64580a7e271b6570513cd414f94434822166d
2020-03-10 10:35:53 +00:00
Automerger Merge Worker
65ffa79f4a Merge "Skip Route tests that are R-specific on Q" am: 3e3abc9ec4
Change-Id: I385fb495bacc26e1959492c53d063409a4e7bf02
2020-03-10 10:28:15 +00:00
Chiachang Wang
3e3abc9ec4 Merge "Skip Route tests that are R-specific on Q" 2020-03-10 10:24:48 +00:00
Chiachang Wang
1d74bab6e7 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
0e1759bdfa 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
45589d6029 Merge "Add test for getDeprecationTime and getExpirationTime" am: c5d2170b64 am: 9d279abf30
Change-Id: Ib710d72c9544f3682acda924d2fba60eb379073e
2020-03-10 04:33:33 +00:00
Automerger Merge Worker
9d279abf30 Merge "Add test for getDeprecationTime and getExpirationTime" am: c5d2170b64
Change-Id: Ibf2f370c97a602f186e37ea9ffbe177dd2ee0f1c
2020-03-10 04:09:18 +00:00
Chiachang Wang
c5d2170b64 Merge "Add test for getDeprecationTime and getExpirationTime" 2020-03-10 03:40:55 +00:00
Automerger Merge Worker
67d0cdc860 Merge "Remove redundant connected notification" into rvc-dev am: ea7800cb54
Change-Id: I97eb9fa5e90c9633b59edfda0d591722e9ed9a0c
2020-03-10 02:52:08 +00:00
Lucas Lin
ea7800cb54 Merge "Remove redundant connected notification" into rvc-dev 2020-03-10 02:21:07 +00:00
Automerger Merge Worker
d4bd6dd17c [automerger skipped] Merge "Ignore NetworkAgentConfigTest on Q" into rvc-dev am: 449c8fd974 -s ours
am skip reason: Change-Id I5414d7767c39327ff41673ff13ccd34982e10742 with SHA-1 186adbf536 is in history

Change-Id: I2831c60304d7686e5b571700a3c985fa81cdc140
2020-03-10 01:08:44 +00:00
Automerger Merge Worker
39feb8be14 [automerger skipped] Merge "Skip LinkAddress tests that are R-specific on Q" into rvc-dev am: 6137e3cd42 -s ours
am skip reason: Change-Id I98b14727eabcf569829eee8df34afc057eba6f93 with SHA-1 1306f533e6 is in history

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

Change-Id: Ib6211a718edf3b1185855c066a305b868dbbc5ac
2020-03-10 01:08:06 +00:00
Remi NGUYEN VAN
449c8fd974 Merge "Ignore NetworkAgentConfigTest on Q" into rvc-dev 2020-03-10 00:59:50 +00:00
Remi NGUYEN VAN
6137e3cd42 Merge "Skip LinkAddress tests that are R-specific on Q" into rvc-dev 2020-03-10 00:59:32 +00:00
Remi NGUYEN VAN
70bb7064cf Merge "Ignore testReevaluateNetwork until Q" into rvc-dev 2020-03-10 00:59:12 +00:00
Automerger Merge Worker
23b70ef8a6 Merge "Clear UIDs when sharing NetworkCapabilties for ConnectivityDiagnostics." am: 42fbfe8826 am: 6196f04eed
Change-Id: Ia137b4610408b672cb1e1cdbcdb05a9db2e3c899
2020-03-09 20:16:51 +00:00
Automerger Merge Worker
6196f04eed Merge "Clear UIDs when sharing NetworkCapabilties for ConnectivityDiagnostics." am: 42fbfe8826
Change-Id: I1336262b19aaa729fb07410eb9aeeb7869f2f88f
2020-03-09 19:59:18 +00:00
Cody Kesting
42fbfe8826 Merge "Clear UIDs when sharing NetworkCapabilties for ConnectivityDiagnostics." 2020-03-09 15:12:51 +00:00
Automerger Merge Worker
1fa2a65991 [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 156c5b1e46 is in history

Change-Id: I4c306f682bb9ea787bf1bfd8f3e17aa15aae9c3e
2020-03-09 09:07:39 +00:00
Automerger Merge Worker
911106c17c 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
ac98e787d3 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
d7e80c1f34 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
890f021f5a 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
78d504da06 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
de03bda1c3 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
37e766f94d Merge "Remove the NetworkScore class." into rvc-dev am: e34d090bce
Change-Id: I9849a147d568ecf63a3021f42dada2d745a64876
2020-03-09 06:03:18 +00:00
Automerger Merge Worker
d8867b58c5 [automerger skipped] Merge "Add more assertions to testStackedLinkProperties." into rvc-dev am: 78c79bec07 -s ours
am skip reason: Change-Id I7d111382be215a926a7d7d4701bd3c3e94372b99 with SHA-1 2e6a35ef5e is in history

Change-Id: I9d9754032c5a29d9054348948abf41c0fc279332
2020-03-09 06:02:55 +00:00
Chalard Jean
e34d090bce Merge "Remove the NetworkScore class." into rvc-dev 2020-03-09 05:54:30 +00:00
Automerger Merge Worker
6c8105baa0 [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 5668f7198b is in history

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

Change-Id: I34004ebf134fa2698b0dd49f2ccc9e341d8bdd97
2020-03-09 05:34:45 +00:00
Automerger Merge Worker
4527faa944 Merge "Ignore NetworkAgentConfigTest on Q" am: b6871630d7 am: 42eac89804
Change-Id: I5e2d10bac0a623f92a2fcf58f57865761dfd0ea4
2020-03-09 05:22:45 +00:00
Automerger Merge Worker
5bab557100 Merge "Skip LinkAddress tests that are R-specific on Q" am: b2f8f992ba am: e7fa2e1710
Change-Id: I111cbc2a1c845adb67a80ccb7833784b835190fd
2020-03-09 05:22:31 +00:00
Automerger Merge Worker
9c7d889f22 Merge "Ignore testReevaluateNetwork until Q" am: 48f2c29253 am: 05fee52ee7
Change-Id: Id902b448c0dba503b7701ff3974b6ae8433a0be8
2020-03-09 05:21:49 +00:00
Automerger Merge Worker
42eac89804 Merge "Ignore NetworkAgentConfigTest on Q" am: b6871630d7
Change-Id: I4626672d2e5e96c7f249f34850f490199d82b06c
2020-03-09 05:12:17 +00:00
Automerger Merge Worker
e7fa2e1710 Merge "Skip LinkAddress tests that are R-specific on Q" am: b2f8f992ba
Change-Id: I9221f3dbe00d9994b73c973cb61a59da7d32b0ac
2020-03-09 05:12:00 +00:00
Automerger Merge Worker
05fee52ee7 Merge "Ignore testReevaluateNetwork until Q" am: 48f2c29253
Change-Id: I0c8c1ecba97100efc49c2ec776af83a60160bd44
2020-03-09 05:11:40 +00:00
Remi NGUYEN VAN
b6871630d7 Merge "Ignore NetworkAgentConfigTest on Q" 2020-03-09 05:03:20 +00:00
Remi NGUYEN VAN
b2f8f992ba Merge "Skip LinkAddress tests that are R-specific on Q" 2020-03-09 05:00:33 +00:00
Remi NGUYEN VAN
48f2c29253 Merge "Ignore testReevaluateNetwork until Q" 2020-03-09 05:00:12 +00:00
Automerger Merge Worker
e58e7a4d85 Add more assertions to testStackedLinkProperties.
Check all routes that are added and removed instead of just some
of them. This is in preparation of an upcoming change that
switches to adding and creating routes by issuing direct calls to
netd.

Also rename the misleading ipv4Default route variable to
ipv4Subnet, which is what it actually is.

Bug: 142892223
Test: test-only change
Change-Id: I7d111382be215a926a7d7d4701bd3c3e94372b99
Merged-In: I7d111382be215a926a7d7d4701bd3c3e94372b99
(cherry picked from commit dcb35cb9a5d1c250e6564b6e66a4b436dd11c795)
2020-03-09 03:48:15 +00:00
Automerger Merge Worker
76eead56aa Remove the NetworkScore class.
This class is useless at this point and introduces overhead.

Bug: 113554781
Test: FrameworksNetTests
Change-Id: Ib5f540070222865260c16c7182cc13c710a243c2
Merged-In: Ib5f540070222865260c16c7182cc13c710a243c2
(cherry picked from commit c3489ad3a6ce98218ce223cea877586781025b98)
2020-03-09 03:46:34 +00:00
Automerger Merge Worker
13a85611f8 test: ConnectivityService: Validate Route Add/Del
Validate route addition and deletion after linkProperties are
changed.

Bug: 142892223
Test: atest ConnectivityServiceTest#testStackedLinkProperties
Change-Id: I18296b933e856a0f8a4c1dbd75bd35024853bfbb
Merged-In: I18296b933e856a0f8a4c1dbd75bd35024853bfbb
(cherry picked from commit a22a979a0caf3e3533ede410d48127084052aec5)
2020-03-09 03:36:10 +00:00
Automerger Merge Worker
87cdb7c771 test: LinkProperties: Unique Route Destinations
Routes will always have unique destinations. Update tests
to use unique destinations when adding multiple routes.

Bug: 142892223
Test: treehugger
Change-Id: I238899b0643407a1be29eb66d28728ca5d5dbc80
Merged-In: I238899b0643407a1be29eb66d28728ca5d5dbc80
(cherry picked from commit 891ea460b10c3ee3c74298dad828bd550e66b81f)
2020-03-09 03:33:03 +00:00
Remi NGUYEN VAN
186adbf536 Ignore NetworkAgentConfigTest on Q
NetworkAgentConfig did not exist on Q.

Test: atest CtsNetTestCasesLatestSdk:android.net.NetworkAgentConfigTest
          on Q and R devices
Bug: 150918852
Change-Id: I5414d7767c39327ff41673ff13ccd34982e10742
2020-03-09 12:04:39 +09:00