Lorenzo Colitti
e396d3a120
Merge "Don't run testGetAllNetworkStateSnapshots in instant app mode" am: b91372a50f am: ec110e2e24 am: 7ec0a4852a
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1737396
Change-Id: Ie69d104e91ac13d0403ff11a5e7f8a6d93bc4cb1
2021-06-15 17:37:30 +00:00
Anton Hansson
69f32ee3a1
[automerger skipped] Merge "Add tethering bootclasspath fragment to its sdk" am: ee350966fa am: 11b6b499aa -s ours am: f588321116 -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: Ifcd48f675a3289c0995c93e13416f2845aa161be
2021-06-15 17:35:14 +00:00
Lorenzo Colitti
daa569a6e3
[automerger skipped] Merge changes I3fffbf4a,If557b0a1 into sc-dev am: bba6383a73 -s ours am: 52832c76f0 -s ours
...
am skip reason: Merged-In I3fffbf4a5dea68e61349de8b41bea49b8a319f86 with SHA-1 4425a6147c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14963613
Change-Id: I918fc385b407f29a23d44114b732034bf3ef92e3
2021-06-15 17:34:45 +00:00
Lucas Lin
d3195fe2e7
Merge "Send a proxy broadcast when apps moved from/to a VPN" am: cfc86ef0f6 am: f7aa7c51ee am: c3b4cf2e19
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1717735
Change-Id: Icb1af8bf4ded2984d4c10385bf692d95c6d2e55d
2021-06-15 17:34:24 +00:00
Lorenzo Colitti
e49931138d
Merge "Verify kernel implementation of AES-XCBC" am: ea56397997 am: 6c08a1824b am: 1082fd5b39
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1503696
Change-Id: Iac2a6038ad699bf741db3318df551ac94cef96e7
2021-06-15 17:34:01 +00:00
Lorenzo Colitti
e703cb56a8
Merge "Verify kernel implementation of AES-CTR" am: b8aeaa220c am: 069c4c996a am: 12da36445e
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1503695
Change-Id: I276e2cdb690bb914c800d193b2db8d33412ab83a
2021-06-15 17:33:10 +00:00
TreeHugger Robot
49c6d72288
[automerger skipped] Merge "Add unit test when querying TYPE_WIFI + null/empty/non-null subscriberId" into sc-dev am: 97e90536a8 -s ours am: 431266e81e -s ours
...
am skip reason: Merged-In Id4ae06840e1749997e970b8f1ec391060967bd47 with SHA-1 caa6f1793d is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14963611
Change-Id: If5e2316f3db265f3c0dd916415eb18bc508bf29b
2021-06-15 17:32:38 +00:00
Nucca Chen
9db6bc1dd8
Merge "Improve dumping IPv4 map entries." am: 26f799f2d7 am: 7bd9af79a7 am: 21a62c5bcb
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1737394
Change-Id: I225cc3c26e3142f648846259f7e5d4e273f24468
2021-06-15 17:32:26 +00:00
Remi NGUYEN VAN
61f472c814
Merge "Fix KeepalivePacketDataUtilTest crash on eng build" am: efdffa82f8 am: ddca01a6af am: d5de41b6ff
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1736261
Change-Id: I017930e80c66ad465e5d27d96e2b09159081308d
2021-06-15 17:31:43 +00:00
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
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
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
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
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
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