Commit Graph

43538 Commits

Author SHA1 Message Date
Treehugger Robot
2735eed360 Merge "Dump underlying BPF traffic stats as well as higher-level stats." am: a79b785ff0 am: 3a6c47e8ca am: 5298ddbb00
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1737393

Change-Id: I0c64de1ecf6956266f1673d37472adb99c7baaa4
2021-06-15 17:31:06 +00:00
Treehugger Robot
b9ff53459e Merge "Add unit test when querying TYPE_WIFI + null/empty/non-null subscriberId" am: 1dba7454b3 am: 703321fc81 am: eb7d65af96
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727826

Change-Id: I2bcd17cc7d46c4eeae6835b10f77fc84bd5d067b
2021-06-15 17:30:30 +00:00
Lorenzo Colitti
f6e7580537 Merge "Verify kernel implementation of ChaCha20Poly1305" am: 69c14d531c am: 2ddc21f483 am: 19fb7cbecf
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1503694

Change-Id: Id2a70fb5ca7c7440e1eb805a92f92ea001a25c8f
2021-06-15 17:30:15 +00:00
Lorenzo Colitti
a368e899c8 Merge "Support algorithm configurability in PacketUtils EspHeader" am: ec5d07c59e am: 3231562efc am: 6c7f137f2f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1503693

Change-Id: Ie09da5f251ec838a1f316b61343ddbb9376220de
2021-06-15 17:23:02 +00:00
Luke Huang
34b6911423 [automerger skipped] Merge "Modify NsdServiceTest to conform to its new mechanism" into sc-dev am: fcc69726ed -s ours am: a040a3d568 -s ours
am skip reason: Merged-In I4c485a5d8fb4d6f52d82633a579bce4feb5c6375 with SHA-1 a46c4d2726 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14963260

Change-Id: Ie745a3f3d5fb52350354664f3b61aadaed773784
2021-06-15 17:19:41 +00:00
Lorenzo Colitti
af578b22a0 Don't run testGetAllNetworkStateSnapshots in instant app mode am: 1ee5ba31a6 am: e5f9800e0b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14935371

Change-Id: Ia22331d8b3c7fa2eeb5b939871a680d6fd74e43a
2021-06-15 16:49:10 +00:00
Lorenzo Colitti
e5f9800e0b Don't run testGetAllNetworkStateSnapshots in instant app mode am: 1ee5ba31a6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14935371

Change-Id: I78224ae28eba3a4822d584c49d29085275f6cd77
2021-06-15 16:37:30 +00:00
Lorenzo Colitti
1ee5ba31a6 Don't run testGetAllNetworkStateSnapshots in instant app mode
Instant app mode doesn't have permission to request networks.
Thus, ignore the test in instant app mode.

Bug: 189724761
Test: CtsNetTestCases:ConnectivityManagerTest#testGetAllNetworkStateSnapshots \
      --instant
Original-Change: https://android-review.googlesource.com/1737396
Merged-In: I2897462f4ef6c019b80a3b5159b1c41f397af8de
Change-Id: I2897462f4ef6c019b80a3b5159b1c41f397af8de
2021-06-15 14:06:26 +00:00
Lorenzo Colitti
f848755b19 Merge changes I3fffbf4a,If557b0a1 into sc-dev am: bba6383a73 am: 0bb712f93c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14963613

Change-Id: I4d18e6b4d1d709a8a31df729339f6c910a6af257
2021-06-15 11:42:19 +00:00
Treehugger Robot
73b7ef1b8c Dump underlying BPF traffic stats as well as higher-level stats. am: 898d5adb31 am: b92c99534a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14963612

Change-Id: I8315081409af7a91dd2efbb8159c5a104156c23f
2021-06-15 11:42:14 +00:00
Lorenzo Colitti
0bb712f93c Merge changes I3fffbf4a,If557b0a1 into sc-dev am: bba6383a73
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14963613

Change-Id: Iefc6f6ead2b61e2c36dea1c2a9077990b1d4980b
2021-06-15 11:28:07 +00:00
Treehugger Robot
b92c99534a Dump underlying BPF traffic stats as well as higher-level stats. am: 898d5adb31
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14963612

Change-Id: Idbc82073afde61e7f3706b7d975063a9fa1b25fd
2021-06-15 11:28:05 +00:00
Lorenzo Colitti
bba6383a73 Merge changes I3fffbf4a,If557b0a1 into sc-dev
* changes:
  Improve dumping IPv4 map entries.
  Dump underlying BPF traffic stats as well as higher-level stats.
2021-06-15 10:24:41 +00:00
TreeHugger Robot
38d2b058d9 Merge "Add unit test when querying TYPE_WIFI + null/empty/non-null subscriberId" into sc-dev am: 97e90536a8 am: 8448b67a15
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14963611

Change-Id: Idd79cfc7ba74fafb2afa2c41d01e8a31c9322f9d
2021-06-15 09:52:38 +00:00
TreeHugger Robot
8448b67a15 Merge "Add unit test when querying TYPE_WIFI + null/empty/non-null subscriberId" into sc-dev am: 97e90536a8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14963611

Change-Id: I1e444f94cff2cb0ce4041224a70b00997e24cdd4
2021-06-15 09:33:18 +00:00
TreeHugger Robot
97e90536a8 Merge "Add unit test when querying TYPE_WIFI + null/empty/non-null subscriberId" into sc-dev 2021-06-15 09:16:57 +00:00
Nucca Chen
4425a6147c Improve dumping IPv4 map entries.
1. Dump both upstream and downstream rules.
2. Also dump rule last used time.

Test: manual
Bug: 190783768
Original-Change: https://android-review.googlesource.com/1737394
Merged-In: I3fffbf4a5dea68e61349de8b41bea49b8a319f86
Change-Id: I3fffbf4a5dea68e61349de8b41bea49b8a319f86
2021-06-15 08:20:31 +00:00
Treehugger Robot
898d5adb31 Dump underlying BPF traffic stats as well as higher-level stats.
This provides a better way to tell whether traffic is flowing.

Test: manual
Bug: 190783768
Original-Change: https://android-review.googlesource.com/1737393
Merged-In: If557b0a18fc0aea1bf6a65d91547fc1930098ed0
Change-Id: If557b0a18fc0aea1bf6a65d91547fc1930098ed0
2021-06-15 08:19:51 +00:00
Treehugger Robot
5298ddbb00 Merge "Dump underlying BPF traffic stats as well as higher-level stats." am: a79b785ff0 am: 3a6c47e8ca
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1737393

Change-Id: Ia49eb7404bc856acac6f62fd3e480efd1674e66c
2021-06-15 07:34:49 +00:00
Treehugger Robot
3a6c47e8ca Merge "Dump underlying BPF traffic stats as well as higher-level stats." am: a79b785ff0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1737393

Change-Id: I48e40cda3974f9923ab9045d899033293e52d42c
2021-06-15 07:17:17 +00:00
Treehugger Robot
eb7d65af96 Merge "Add unit test when querying TYPE_WIFI + null/empty/non-null subscriberId" am: 1dba7454b3 am: 703321fc81
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727826

Change-Id: Iff7fec80b664de6c225a283f359389a9ddb50533
2021-06-15 07:08:55 +00:00
Treehugger Robot
a79b785ff0 Merge "Dump underlying BPF traffic stats as well as higher-level stats." 2021-06-15 07:05:05 +00:00
Treehugger Robot
703321fc81 Merge "Add unit test when querying TYPE_WIFI + null/empty/non-null subscriberId" am: 1dba7454b3
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727826

Change-Id: I7468430e5e00282e63860bf6edcfcc5730bebed4
2021-06-15 06:58:54 +00:00
Les Lee
caa6f1793d Add unit test when querying TYPE_WIFI + null/empty/non-null subscriberId
Starting with API level 31, the subscriberId is applicable
for the wifi network. Considering applications may use
null or an empty string as subscriberId (for instance, cts),
frameworks create MATCH_WIFI_WILDCARD NetworkTemplate when querying
wifi network with null or an empty string which is the behavior before
API level 31.

Bug: 188915450
Test: atest -c NetworkStatsManagerTest
Merged-In: Id4ae06840e1749997e970b8f1ec391060967bd47
Change-Id: Id4ae06840e1749997e970b8f1ec391060967bd47
2021-06-15 14:53:25 +08:00
Treehugger Robot
1dba7454b3 Merge "Add unit test when querying TYPE_WIFI + null/empty/non-null subscriberId" 2021-06-15 06:46:49 +00:00
Lorenzo Colitti
19fb7cbecf Merge "Verify kernel implementation of ChaCha20Poly1305" am: 69c14d531c am: 2ddc21f483
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1503694

Change-Id: I6246f3890bbf27d0d485ee3d3701dca7c23a3796
2021-06-15 05:43:46 +00:00
Lorenzo Colitti
6c7f137f2f Merge "Support algorithm configurability in PacketUtils EspHeader" am: ec5d07c59e am: 3231562efc
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1503693

Change-Id: I2574e155f16c82fdc4647f23d2f77c0755062a52
2021-06-15 05:43:42 +00:00
Lorenzo Colitti
2ddc21f483 Merge "Verify kernel implementation of ChaCha20Poly1305" am: 69c14d531c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1503694

Change-Id: Ibcb5a3ace65e96497bc969f85c0febff32d80fec
2021-06-15 05:31:37 +00:00
Lorenzo Colitti
3231562efc Merge "Support algorithm configurability in PacketUtils EspHeader" am: ec5d07c59e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1503693

Change-Id: Ieced25169b51cf1db1f97447d5f754dd7443d524
2021-06-15 05:31:25 +00:00
Lorenzo Colitti
69c14d531c Merge "Verify kernel implementation of ChaCha20Poly1305" 2021-06-15 05:18:24 +00:00
Lorenzo Colitti
ec5d07c59e Merge "Support algorithm configurability in PacketUtils EspHeader" 2021-06-15 05:17:51 +00:00
Luke Huang
3f692884be [automerger skipped] Merge "Modify NsdServiceTest to conform to its new mechanism" into sc-dev am: fcc69726ed am: 7e773cd7b7 -s ours
am skip reason: Merged-In I4c485a5d8fb4d6f52d82633a579bce4feb5c6375 with SHA-1 18d636a05e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14963260

Change-Id: I6a33843f95b2de27cf4dcd31e02873330d76b763
2021-06-15 05:03:48 +00:00
Cody Kesting
2eaba3401a [automerger skipped] Keep subIds for Test NetworkCapabilities. am: f5a4fb124b -s ours am: 2052e3076d -s ours
am skip reason: Merged-In I0e1bc617910c9e8ac7b431572f276b1611acc1cb with SHA-1 f5a4fb124b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14969444

Change-Id: Ib32f24c3cea8026acdbd88ce579d19cb61ea2d18
2021-06-15 05:02:42 +00:00
Treehugger Robot
bd79196155 [automerger skipped] Fully setup test TUN iface on create. am: 5cbd7b38ca -s ours am: 5105c15011 -s ours
am skip reason: Merged-In I4c1262e566517bbb03dd610f595e4d18bc4e7735 with SHA-1 5cbd7b38ca is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14969443

Change-Id: Ia3f6c15f1909215ae8ec4e926df8c3a3a3943bc6
2021-06-15 05:02:39 +00:00
Cody Kesting
458e65374b [automerger skipped] Keep subIds for Test NetworkCapabilities. am: f5a4fb124b am: 7ca2e36684 -s ours
am skip reason: Merged-In I0e1bc617910c9e8ac7b431572f276b1611acc1cb with SHA-1 dd346918b4 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14969444

Change-Id: Idf8100ac584d85c137190ef0182a63cb67b66d46
2021-06-15 05:02:27 +00:00
Treehugger Robot
0f0d28d58b [automerger skipped] Fully setup test TUN iface on create. am: 5cbd7b38ca am: ac39fac427 -s ours
am skip reason: Merged-In I4c1262e566517bbb03dd610f595e4d18bc4e7735 with SHA-1 7a5fbc2b6e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14969443

Change-Id: I7fbbe2da9a0086da40a276c8d940fbf76d5b5b97
2021-06-15 05:02:23 +00:00
Luke Huang
a040a3d568 [automerger skipped] Merge "Modify NsdServiceTest to conform to its new mechanism" into sc-dev am: fcc69726ed -s ours
am skip reason: Merged-In I4c485a5d8fb4d6f52d82633a579bce4feb5c6375 with SHA-1 18d636a05e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14963260

Change-Id: I32b0cdfdf3dcad796a0ccf4c4e237e326e878c94
2021-06-15 04:59:23 +00:00
Luke Huang
7e773cd7b7 Merge "Modify NsdServiceTest to conform to its new mechanism" into sc-dev am: fcc69726ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14963260

Change-Id: I93de1a01024f6bddcb8575c1b9038d901acfe3c7
2021-06-15 04:59:00 +00:00
Luke Huang
fcc69726ed Merge "Modify NsdServiceTest to conform to its new mechanism" into sc-dev 2021-06-15 04:52:43 +00:00
Cody Kesting
7ca2e36684 Keep subIds for Test NetworkCapabilities. am: f5a4fb124b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14969444

Change-Id: I8d36d0bf7cbf229710d1c5d69e54b737f3919ec0
2021-06-15 04:50:07 +00:00
Treehugger Robot
ac39fac427 Fully setup test TUN iface on create. am: 5cbd7b38ca
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14969443

Change-Id: I6937e841f5213cc6a5705853a44ca7e519158d44
2021-06-15 04:50:05 +00:00
Cody Kesting
2052e3076d [automerger skipped] Keep subIds for Test NetworkCapabilities. am: f5a4fb124b -s ours
am skip reason: Merged-In I0e1bc617910c9e8ac7b431572f276b1611acc1cb with SHA-1 dd346918b4 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14969444

Change-Id: Ic2d50ae70b9a14685a2de5a895111993423226ac
2021-06-15 04:49:09 +00:00
Treehugger Robot
5105c15011 [automerger skipped] Fully setup test TUN iface on create. am: 5cbd7b38ca -s ours
am skip reason: Merged-In I4c1262e566517bbb03dd610f595e4d18bc4e7735 with SHA-1 7a5fbc2b6e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14969443

Change-Id: If709059e6e0732b0701066af67c10133e807e937
2021-06-15 04:49:06 +00:00
Les Lee
a0592d3e06 Add unit test when querying TYPE_WIFI + null/empty/non-null subscriberId
Starting with API level 31, the subscriberId is applicable
for the wifi network. Considering applications may use
null or an empty string as subscriberId (for instance, cts),
frameworks create MATCH_WIFI_WILDCARD NetworkTemplate when querying
wifi network with null or an empty string which is the behavior before
API level 31.

Bug: 188915450
Test: atest -c NetworkStatsManagerTest
Change-Id: Id4ae06840e1749997e970b8f1ec391060967bd47
2021-06-15 12:04:23 +08:00
Lorenzo Colitti
704b8013f1 Dump underlying BPF traffic stats as well as higher-level stats.
This provides a better way to tell whether traffic is flowing.

Test: manual
Bug: 190783768
Change-Id: If557b0a18fc0aea1bf6a65d91547fc1930098ed0
2021-06-15 12:49:07 +09:00
Paul Hu
71b732397a [automerger skipped] Merge "Add DEFAULT_NETWORK_PRIORITY constants" am: c323f6502d am: 136bd35a67 -s ours am: 36df497e05 -s ours
am skip reason: Merged-In I0ea71b348492aeb4784d487bed4cfd5d387426ba with SHA-1 c2198778ab is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1718950

Change-Id: I883e7e9330f569a181dc7b1a12ecd300eb2d1231
2021-06-15 03:17:34 +00:00
Paul Hu
36df497e05 [automerger skipped] Merge "Add DEFAULT_NETWORK_PRIORITY constants" am: c323f6502d am: 136bd35a67 -s ours
am skip reason: Merged-In I0ea71b348492aeb4784d487bed4cfd5d387426ba with SHA-1 c2198778ab is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1718950

Change-Id: Id9376bb7d70324225771e19e48f4e0a30bb320ed
2021-06-15 03:05:04 +00:00
Paul Hu
136bd35a67 Merge "Add DEFAULT_NETWORK_PRIORITY constants" am: c323f6502d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1718950

Change-Id: I8167aaded9a7e2125cbe317401cc45365313b76d
2021-06-15 02:55:44 +00:00
Paul Hu
c323f6502d Merge "Add DEFAULT_NETWORK_PRIORITY constants" 2021-06-15 02:42:03 +00:00
Paul Hu
980391c494 [automerger skipped] Merge "Add more unit tests for mobile data preferred uids feature" am: c6741064d0 am: c639d88a44 -s ours am: 364b86affe -s ours
am skip reason: Merged-In I63f65bffc1b8883ddfd774222e26e629d7ea1f94 with SHA-1 7ed70a944c is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1717436

Change-Id: Ie6ed625735f40f68ad2c2ff62be50f209ff4f915
2021-06-15 02:08:26 +00:00