Commit Graph

36610 Commits

Author SHA1 Message Date
Chiachang Wang
c60aab0243 Merge "Ignore testFactoryReset in instant app mode" am: f3283e6b93
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1735673

Change-Id: I497b71bf3a54c177f1b6e2cd63b3588b3c85f2cb
2021-06-16 02:06:37 +00:00
Chiachang Wang
f3283e6b93 Merge "Ignore testFactoryReset in instant app mode" 2021-06-16 01:49:51 +00:00
Lorenzo Colitti
f9eb2c7b0b Merge changes from topic "per-app-cts" am: 5f78e30839
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1665079

Change-Id: I214f7dd18806d6880b4fe40a6cd5bbe63819f9a0
2021-06-16 01:11:33 +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
5f78e30839 Merge changes from topic "per-app-cts"
* changes:
  CTS tests for setOemNetworkPreference
  Update CS so that per-app OEM APIs can be tested
2021-06-16 00:47:06 +00:00
James Mattis
db143f99cf CTS tests for setOemNetworkPreference
CTS tests to validate the setOemNetworkPreference API on
ConnectivityManager. Additionally, a small bit of cleanup for
assumptions around the Wi-Fi feature.

Bug: 176496580
Bug: 176494815
Test: atest CtsNetTestCases:
android.net.cts.ConnectivityManagerTest#
testSetOemNetworkPreferenceForTestPref --iterations
atest CtsNetTestCases:
android.net.cts.ConnectivityManagerTest#
testSetOemNetworkPreferenceForTestOnlyPref --iterations

Change-Id: Ia3e4b336123b60f6df1582aca2979129112afedc
2021-06-15 12:35:18 -07: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
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
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
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
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
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
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
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
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
Lorenzo Colitti
70f43ee58e Improve dumping IPv4 map entries.
1. Dump both upstream and downstream rules.
2. Also dump rule last used time.

Test: manual
Bug: 190783768
Change-Id: I3fffbf4a5dea68e61349de8b41bea49b8a319f86
2021-06-15 12:54:08 +09: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
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
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
Cody Kesting
f92b7d2eb8 Merge "Keep subIds for Test NetworkCapabilities." am: 35839b48ad
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1719793

Change-Id: Ifeaf14dc222b139838f15f6454cbc215869e3f20
2021-06-14 19:33:18 +00:00
Treehugger Robot
4b8900e520 Merge "Fully setup test TUN iface on create." am: 6c0525fbd5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1719792

Change-Id: Id1f9993e2c945fdb7a150c701c43d095bcfed793
2021-06-14 19:33:08 +00:00
Cody Kesting
35839b48ad Merge "Keep subIds for Test NetworkCapabilities." 2021-06-14 19:22:00 +00:00
Treehugger Robot
6c0525fbd5 Merge "Fully setup test TUN iface on create." 2021-06-14 19:14:02 +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
Anton Hansson
a12ffacf6c Add tethering bootclasspath fragment to its sdk
This subsumes the java_sdk_library in the sdk.

Bug: 188427719
Test: build_mainline_modules.sh
Change-Id: Ib2ebb3893135b4dd91812f1f1b0915540cfd64cb
Merged-In: Ib2ebb3893135b4dd91812f1f1b0915540cfd64cb
(cherry picked from commit 3669599dec)
2021-06-14 19:23:49 +01: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