James Mattis
39a42aefc6
Update CS so that per-app OEM APIs can be tested am: fa270db5f7 am: 6c54d5e4c4
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1723050
Change-Id: I5f8bc3a60d92e86047debd9363e5dddf06da6ee8
2021-06-16 01:30:05 +00:00
James Mattis
6c54d5e4c4
Update CS so that per-app OEM APIs can be tested am: fa270db5f7
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1723050
Change-Id: Ib5937d0fd732f915416e957299e739fe10d0bf55
2021-06-16 01:11:26 +00:00
Lorenzo Colitti
ee260679f7
[automerger skipped] Don't run testGetAllNetworkStateSnapshots in instant app mode am: 1ee5ba31a6 -s ours
...
am skip reason: Merged-In I2897462f4ef6c019b80a3b5159b1c41f397af8de with SHA-1 3d35a9736f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14935371
Change-Id: Idbaf8e6312545783e3fbabbfd0796ed21b3ec7a9
2021-06-15 16:36:33 +00:00
Lorenzo Colitti
4584e16096
Merge "Cleanup commit to remove @SkipPresubmit and fix nits" am: 81ede794c7 am: ff949864da
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1729418
Change-Id: I94afc33b33b41a237648e34753d1e808ec548bb7
2021-06-15 15:30:59 +00:00
Lorenzo Colitti
bb9855adb6
Merge "Verify kernel implementation of AES-CMAC" am: a1363cbd82 am: 61cad6e216
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1697312
Change-Id: I2a56508a3b863a6544df35d9fd17ecd2cda8869c
2021-06-15 15:30:52 +00:00
Lorenzo Colitti
ff949864da
Merge "Cleanup commit to remove @SkipPresubmit and fix nits" am: 81ede794c7
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1729418
Change-Id: I9816ee225b2c647a3127e5a4647722e366c0ddf8
2021-06-15 15:14:30 +00:00
Lorenzo Colitti
61cad6e216
Merge "Verify kernel implementation of AES-CMAC" am: a1363cbd82
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1697312
Change-Id: Iffd5043dc798773405cf10c41c60597c0b8aaaa7
2021-06-15 15:13:18 +00:00
Lorenzo Colitti
81ede794c7
Merge "Cleanup commit to remove @SkipPresubmit and fix nits"
2021-06-15 14:54:07 +00:00
Lorenzo Colitti
a1363cbd82
Merge "Verify kernel implementation of AES-CMAC"
2021-06-15 14:53:36 +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
7ec0a4852a
Merge "Don't run testGetAllNetworkStateSnapshots in instant app mode" am: b91372a50f am: ec110e2e24
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1737396
Change-Id: I85bebb2a928b28cd8682e061ce5cc7433f47cec4
2021-06-15 13:42:57 +00:00
Lorenzo Colitti
ec110e2e24
Merge "Don't run testGetAllNetworkStateSnapshots in instant app mode" am: b91372a50f
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1737396
Change-Id: I9807baa0089b208c6831c73b86cfcee8026f1d6b
2021-06-15 13:38:58 +00:00
Anton Hansson
f588321116
[automerger skipped] Merge "Add tethering bootclasspath fragment to its sdk" am: ee350966fa am: 11b6b499aa -s ours
...
am skip reason: Merged-In Ib2ebb3893135b4dd91812f1f1b0915540cfd64cb with SHA-1 3669599dec is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1737041
Change-Id: I1def53219bb693267c5b4cbe8ccaec16ae1d5099
2021-06-15 13:38:53 +00:00
Lorenzo Colitti
b91372a50f
Merge "Don't run testGetAllNetworkStateSnapshots in instant app mode"
2021-06-15 13:29:19 +00:00
Anton Hansson
11b6b499aa
Merge "Add tethering bootclasspath fragment to its sdk" am: ee350966fa
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1737041
Change-Id: Iceb19109282c105b707f22004d1b4181695860b9
2021-06-15 13:26:23 +00:00
Anton Hansson
ee350966fa
Merge "Add tethering bootclasspath fragment to its sdk"
2021-06-15 13:11:44 +00:00
Lorenzo Colitti
52832c76f0
[automerger skipped] Merge changes I3fffbf4a,If557b0a1 into sc-dev am: bba6383a73 -s ours
...
am skip reason: Merged-In I3fffbf4a5dea68e61349de8b41bea49b8a319f86 with SHA-1 70f43ee58e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14963613
Change-Id: Ib3ea6dd997f333c97c152badd368dfa119dceda2
2021-06-15 11:26:41 +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
Lucas Lin
c3b4cf2e19
Merge "Send a proxy broadcast when apps moved from/to a VPN" am: cfc86ef0f6 am: f7aa7c51ee
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1717735
Change-Id: I12ec4b1c5e4123c9e13219ec0e83858bf1ec09ea
2021-06-15 09:32:28 +00:00
Lorenzo Colitti
1082fd5b39
Merge "Verify kernel implementation of AES-XCBC" am: ea56397997 am: 6c08a1824b
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1503696
Change-Id: If6ce78835779e618678e0304e4a8e88d98fad481
2021-06-15 09:32:24 +00:00
Lorenzo Colitti
12da36445e
Merge "Verify kernel implementation of AES-CTR" am: b8aeaa220c am: 069c4c996a
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1503695
Change-Id: Ie167ff85aa7305134865c91f4e6afad649ebdb8d
2021-06-15 09:32:19 +00:00
TreeHugger Robot
431266e81e
[automerger skipped] Merge "Add unit test when querying TYPE_WIFI + null/empty/non-null subscriberId" into sc-dev am: 97e90536a8 -s ours
...
am skip reason: Merged-In Id4ae06840e1749997e970b8f1ec391060967bd47 with SHA-1 a0592d3e06 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14963611
Change-Id: I7e8fa47946e8682c38fc0b0d1fd4e7aae9967a36
2021-06-15 09:31:51 +00:00
Lucas Lin
f7aa7c51ee
Merge "Send a proxy broadcast when apps moved from/to a VPN" am: cfc86ef0f6
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1717735
Change-Id: I2fc18571e6ecf36d919d9c5971c275f5c26ddfa4
2021-06-15 09:28:16 +00:00
Lucas Lin
cfc86ef0f6
Merge "Send a proxy broadcast when apps moved from/to a VPN"
2021-06-15 09:26:21 +00:00
Lorenzo Colitti
6c08a1824b
Merge "Verify kernel implementation of AES-XCBC" am: ea56397997
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1503696
Change-Id: Icd06cea452718f8771677a5737305c5a7fb4a720
2021-06-15 09:20:10 +00:00
Lorenzo Colitti
069c4c996a
Merge "Verify kernel implementation of AES-CTR" am: b8aeaa220c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1503695
Change-Id: I3be7be57d109bc44e35826bf6629f79a67c1eae8
2021-06-15 09:20:00 +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
Lorenzo Colitti
ea56397997
Merge "Verify kernel implementation of AES-XCBC"
2021-06-15 09:12:35 +00:00
Lorenzo Colitti
b8aeaa220c
Merge "Verify kernel implementation of AES-CTR"
2021-06-15 09:09:05 +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
Nucca Chen
21a62c5bcb
Merge "Improve dumping IPv4 map entries." am: 26f799f2d7 am: 7bd9af79a7
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1737394
Change-Id: I0d7d72aad8c3f10af402111f62f5706c0703514f
2021-06-15 08:17:11 +00:00
Nucca Chen
7bd9af79a7
Merge "Improve dumping IPv4 map entries." am: 26f799f2d7
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1737394
Change-Id: I9689a3ef866b2d4fd246663bd0909082b86a4624
2021-06-15 08:02:33 +00:00
Nucca Chen
26f799f2d7
Merge "Improve dumping IPv4 map entries."
2021-06-15 07:41:22 +00:00
Remi NGUYEN VAN
d5de41b6ff
Merge "Fix KeepalivePacketDataUtilTest crash on eng build" am: efdffa82f8 am: ddca01a6af
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1736261
Change-Id: Id5cc28a2387288bdb975c29da6571d44e939b932
2021-06-15 07:34:54 +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
Remi NGUYEN VAN
ddca01a6af
Merge "Fix KeepalivePacketDataUtilTest crash on eng build" am: efdffa82f8
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1736261
Change-Id: I5debd8529ba5018ef421ca0dd1fc41905c014ac2
2021-06-15 07:17:28 +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
Remi NGUYEN VAN
efdffa82f8
Merge "Fix KeepalivePacketDataUtilTest crash on eng build"
2021-06-15 07:08:23 +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
Aaron Huang
3d35a9736f
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
Change-Id: I2897462f4ef6c019b80a3b5159b1c41f397af8de
2021-06-15 14:17:07 +08: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