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
Lorenzo Colitti
b91372a50f
Merge "Don't run testGetAllNetworkStateSnapshots in instant app mode"
2021-06-15 13:29:19 +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
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
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
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
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
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
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
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
Lorenzo Colitti
ec5d07c59e
Merge "Support algorithm configurability in PacketUtils EspHeader"
2021-06-15 05:17:51 +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
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
c639d88a44
Merge "Add more unit tests for mobile data preferred uids feature" am: c6741064d0
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1717436
Change-Id: I0791a23eef801c24bf4605264a7478edd9167b88
2021-06-15 01:39:32 +00:00
Paul Hu
c6741064d0
Merge "Add more unit tests for mobile data preferred uids feature"
2021-06-15 01:28:19 +00:00
Yan Yan
8f12415e51
Merge "Set up and tear down test network in TestNetworkRunnable" am: 1e071f9120 am: 83f08bd8ee
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1503692
Change-Id: I4b57cc2b0d1f3f6c6e01dc2eed9c63d42d253ad9
2021-06-15 01:06:38 +00:00
Yan Yan
83f08bd8ee
Merge "Set up and tear down test network in TestNetworkRunnable" am: 1e071f9120
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1503692
Change-Id: I051f69d58f9511fb6ad0574963b217324f54b155
2021-06-15 00:51:17 +00:00
Yan Yan
1e071f9120
Merge "Set up and tear down test network in TestNetworkRunnable"
2021-06-15 00:36:12 +00:00
Sudheer Shanka
7b45312b50
Merge "Avoid waiting unnecessarily if there is no data to return." am: 7184887d71 am: 16063e8281
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1735977
Change-Id: I7a952ff80ce9f68c6a7a6a432799cc1b5b7d1b49
2021-06-14 19:13:27 +00:00
Sudheer Shanka
16063e8281
Merge "Avoid waiting unnecessarily if there is no data to return." am: 7184887d71
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1735977
Change-Id: I9bc8d90381baf74cfe38bc0f30f61a284c86f339
2021-06-14 18:58:27 +00:00
Sudheer Shanka
7184887d71
Merge "Avoid waiting unnecessarily if there is no data to return."
2021-06-14 18:39:30 +00:00
paulhu
e99137226e
Add DEFAULT_NETWORK_PRIORITY constants
...
- Add default network priority to NetworkRequestInfo.
- The default network priority value is used when issue uid
ranges rules to netd. Netd will use the priority value and uid
ranges to generate corresponding ip rules specific to the given
network preference.
Bug: 171872461
Test: atest FrameworksNetTests
Merged-In: I0ea71b348492aeb4784d487bed4cfd5d387426ba
Change-Id: I0ea71b348492aeb4784d487bed4cfd5d387426ba
2021-06-14 15:55:55 +00:00
paulhu
01f52e7cce
Add more unit tests for mobile data preferred uids feature
...
- Add more tests for mobile data preferred uids.
- Also address leftover comments on implementation commit.
Bug: 171872461
Test: atest FrameworksNetTests
Merged-In: I63f65bffc1b8883ddfd774222e26e629d7ea1f94
Change-Id: I63f65bffc1b8883ddfd774222e26e629d7ea1f94
2021-06-14 15:53:05 +00:00
Paul Hu
ab4b8bc600
Merge "Add DEFAULT_NETWORK_PRIORITY constants" into sc-dev am: dcba997adf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14731886
Change-Id: Iabe8738dc2579bd89f6be377666c4e7a9178b1a6
2021-06-14 15:33:35 +00:00
Paul Hu
dcba997adf
Merge "Add DEFAULT_NETWORK_PRIORITY constants" into sc-dev
2021-06-14 15:17:23 +00:00
Paul Hu
31c7026ff9
Merge "Add more unit tests for mobile data preferred uids feature" into sc-dev am: 7d5fa3da7d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14731884
Change-Id: I5a97d3caea19c51597c63319bbb8a720c7f91977
2021-06-14 14:47:46 +00:00
Paul Hu
7d5fa3da7d
Merge "Add more unit tests for mobile data preferred uids feature" into sc-dev
2021-06-14 14:29:29 +00:00
Remi NGUYEN VAN
b397b5645a
Fix KeepalivePacketDataUtilTest crash on eng build
...
The test causes a Log.wtf to be logged, because it tests a method that
should not be used after R. Mock the terrible failure handler to avoid
crashes on eng builds.
Test: atest KeepalivePacketDataUtilTest
Change-Id: Ic06a0db7fefb4acf38b66feba9b47e21f9927b1c
2021-06-14 18:13:39 +09:00
Lorenzo Colitti
9088465b13
Merge "Correctly get uids for per-app network preferences" am: 473ddeaebb am: d9c5536026
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1723617
Change-Id: I1b99d78702c91ce3e4c69de95e09a0c1e7d7e4b5
2021-06-14 06:32:56 +00:00
Lorenzo Colitti
d9c5536026
Merge "Correctly get uids for per-app network preferences" am: 473ddeaebb
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1723617
Change-Id: Ibe5eac43f2c21c9ad5ea956a645d4ce59dcd7759
2021-06-14 06:19:02 +00:00
Lorenzo Colitti
473ddeaebb
Merge "Correctly get uids for per-app network preferences"
2021-06-14 06:07:56 +00:00
Sudheer Shanka
f3d8c6f70e
Avoid waiting unnecessarily if there is no data to return.
...
Bug: 189790442
Test: atest ./tests/cts/hostside/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java
Change-Id: I091991aac8eb11319bd60dc8f07124ace1ad52f1
2021-06-14 03:13:41 +00:00
Luke Huang
614299c262
Merge "Modify NsdServiceTest to conform to its new mechanism" am: c9a2bdf2b9 am: 31f8527bca
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1719018
Change-Id: I2fb0ac98d2f7ae2a2fab3af7bc657f013b59bbc2
2021-06-13 16:52:06 +00:00
Luke Huang
31f8527bca
Merge "Modify NsdServiceTest to conform to its new mechanism" am: c9a2bdf2b9
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1719018
Change-Id: I7f81b5f807114c223f53fe8417d904c4dbe5cb39
2021-06-13 16:09:50 +00:00
Luke Huang
c9a2bdf2b9
Merge "Modify NsdServiceTest to conform to its new mechanism"
2021-06-13 15:20:52 +00:00