Commit Graph

36684 Commits

Author SHA1 Message Date
Yan Yan
0783fed2ba Merge "Test updating underlying network of IpSecTunnelInterface" am: 010ec2cddd
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1488296

Change-Id: I41f60bf0bc369b2ea43107355855bfba02ab9e9f
2021-06-22 17:44:29 +00:00
Yan Yan
010ec2cddd Merge "Test updating underlying network of IpSecTunnelInterface" 2021-06-22 17:27:11 +00:00
Paul Hu
732ab7557c Merge "Add test for CSM#[get|set]MobileDataPreferredUids" am: 5440e0b8e8
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1736504

Change-Id: I1db27baa42bcaccbabf9002c950fdcefa6fb2710
2021-06-22 03:26:32 +00:00
Lucas Lin
d7e6b4dfa9 Merge "Add CTS for isUidNetworkingBlocked & isUidRestrictedOnMeteredNetworks" am: 3f565a44b0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1737395

Change-Id: Id3454c2b2efdf17c3f84fc2e04e14c022baff825
2021-06-22 03:16:30 +00:00
Paul Hu
5440e0b8e8 Merge "Add test for CSM#[get|set]MobileDataPreferredUids" 2021-06-22 01:33:49 +00:00
Lucas Lin
3f565a44b0 Merge "Add CTS for isUidNetworkingBlocked & isUidRestrictedOnMeteredNetworks" 2021-06-21 23:58:49 +00:00
Lucas Lin
9ca145bcfa Merge "Use assertEquals instead of assertTrue to compare the vpn type" am: 56055496f3
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1739093

Change-Id: I91b2ece57f79308436cf34ab3fbf9cdbd6961ed7
2021-06-21 23:50:27 +00:00
Lucas Lin
56055496f3 Merge "Use assertEquals instead of assertTrue to compare the vpn type" 2021-06-21 23:35:16 +00:00
Lucas Lin
72d2223bf7 Merge "Add CTS for systemReady() & getIpSecNetIdRange()" am: 7e2a491835
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1676425

Change-Id: I6a26a8b344c367ce1b876ce67a443435f3de776a
2021-06-21 23:22:19 +00:00
Lucas Lin
7e2a491835 Merge "Add CTS for systemReady() & getIpSecNetIdRange()" 2021-06-21 20:52:46 +00:00
Lucas Lin
8f8e1512d6 Merge "Call ConnectivitySettingsUtils to set/get private DNS related settings" am: c12550b9f4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1719017

Change-Id: I1b0b4beb6653cfc5d09da3d5eda18a6b0a980982
2021-06-21 20:22:10 +00:00
James Mattis
eaa493d033 Merge "Updating timeout for Per-App CTS" am: 420072651d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1736927

Change-Id: I53a0510dd4008be8cb68daf6c65f816b8d0f68a2
2021-06-21 20:21:55 +00:00
Lucas Lin
c12550b9f4 Merge "Call ConnectivitySettingsUtils to set/get private DNS related settings" 2021-06-21 19:12:33 +00:00
James Mattis
420072651d Merge "Updating timeout for Per-App CTS" 2021-06-21 17:17:13 +00:00
Treehugger Robot
62df9b8d06 Merge "Add a test for ConnectivityFrameworkInitializer" am: aa397809e2
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1675598

Change-Id: I70380559fc3b7988f3958ded0d8b3f7aaf804539
2021-06-21 13:54:45 +00:00
Treehugger Robot
9627dd29b5 Merge "Add test for setHttpProxyConfiguration" am: bccd97f0b3
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1564956

Change-Id: I4202c49b98ecf7b6b8fb222f7f57b27e6b779288
2021-06-21 13:54:39 +00:00
Junyu Lai
26bb0a84a6 Merge "Add CTS for registerNetworkOffer" am: f92979bd5b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1731451

Change-Id: I3fccedc04f86a24573222e76cbcf44cb313fe569
2021-06-21 13:54:13 +00:00
Mark Chien
82b26e0d1f Merge changes I270ff43c,Ifc7eee24 am: cec294d1b4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1730548

Change-Id: I435e69ba3fc71cf56a7bf8cc54b394831615fa57
2021-06-21 13:36:57 +00:00
Remi NGUYEN VAN
68114fe408 Merge "Add connectivity coverage tests" am: cc79d7c0f8
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1731232

Change-Id: Ibf40853201b81176c7648c906261129a8bf9e26b
2021-06-21 13:36:05 +00:00
lucaslin
b781a94ccf Add CTS for systemReady() & getIpSecNetIdRange()
Bug: 182963354
Test: 1. atest CtsNetTestCases:ConnectivityManagerTest
      2. atest CtsNetTestCasesLatestSdk:ConnectivityManagerTest
Change-Id: I0b286f32389501402e552010546c62f3e56833d6
2021-06-21 19:37:43 +08:00
Treehugger Robot
aa397809e2 Merge "Add a test for ConnectivityFrameworkInitializer" 2021-06-21 11:23:11 +00:00
Treehugger Robot
bccd97f0b3 Merge "Add test for setHttpProxyConfiguration" 2021-06-21 10:59:12 +00:00
Junyu Lai
f92979bd5b Merge "Add CTS for registerNetworkOffer" 2021-06-21 10:58:04 +00:00
Mark Chien
cec294d1b4 Merge changes I270ff43c,Ifc7eee24
* changes:
  Add enable and disable ip serving common functions
  Allow to use ncm function for usb tethering
2021-06-21 10:56:45 +00:00
Remi NGUYEN VAN
cc79d7c0f8 Merge "Add connectivity coverage tests" 2021-06-21 10:55:33 +00:00
Treehugger Robot
106a4752f7 Merge "Add CTS for setProfileNetworkPreference" am: 5d4f701244
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1733784

Change-Id: I92b3079517424116ef90613a4584b1ad3a74341a
2021-06-21 10:34:31 +00:00
Treehugger Robot
5d4f701244 Merge "Add CTS for setProfileNetworkPreference" 2021-06-21 10:25:05 +00:00
Remi NGUYEN VAN
4abe3f8db3 Merge "Allow mocking permission in TetheringServiceTest" am: ec48bb82aa
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1731231

Change-Id: I8d289032a75b8f05a892a5bf0989f6766e5a4aaf
2021-06-21 10:20:40 +00:00
Remi NGUYEN VAN
b0504221b4 Merge "Initialize TetheringManager lazily" am: 7c5902df7e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1736505

Change-Id: Ic80abe07255d06cdde08d8d302d1d1270f9d0166
2021-06-21 10:20:30 +00:00
Remi NGUYEN VAN
ec48bb82aa Merge "Allow mocking permission in TetheringServiceTest" 2021-06-21 10:19:07 +00:00
Remi NGUYEN VAN
7c5902df7e Merge "Initialize TetheringManager lazily" 2021-06-21 10:03:00 +00:00
Aaron Huang
7320aefbdd Merge "CTS test for PacProxyManager" am: b93396edfb
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1705131

Change-Id: I51ec740e13fa0139589b58e3cfb9ef8ee2af5b37
2021-06-21 09:59:33 +00:00
Aaron Huang
b93396edfb Merge "CTS test for PacProxyManager" 2021-06-21 09:42:33 +00:00
lucaslin
8962128a0b Call ConnectivitySettingsUtils to set/get private DNS related settings
ConnectivitySettingsManager and CtsNetUtils are doing the same
thing to set/get private DNS related settings.
To prevent making the duplication code in two places, move the
body to frameworks/libs/net and call it.

Bug: 185311744
Test: atest CtsNetTestCases CtsNetTestCasesLatestSdk
Change-Id: I3272c825b86ec30c3d0bf4097088c653e668461b
2021-06-21 16:39:08 +08:00
paulhu
8c96badb5d Add test for CSM#[get|set]MobileDataPreferredUids
Bug: 171872461
Test: atest ConnectivityManagerTest
Change-Id: I43dfb049c271602526fa3e89ebb91219c7785a21
2021-06-21 08:36:04 +00:00
Xin Li
5ba981c20a [automerger skipped] DO NOT MERGE - Merge RQ3A.210605.005 am: e7fde0c39a -s ours
am skip reason: Merged-In I524644366a398b34de8f659d0d0d275f3f513c0c with SHA-1 d6d3bf0b89 is already in history

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

Change-Id: I2ba01e9d20b85825c557420b2e3a330cfdb41832
2021-06-21 06:10:47 +00:00
Remi NGUYEN VAN
e4d1cd970e Initialize TetheringManager lazily
Many applications use ConnectivityManager without needing
TetheringManager (or without calling legacy ConnectivityManager methods
that delegate to TetheringManager), so initializing TetheringManager
when ConnectivityManager is created wastes resources.

This is especially true considering that TetheringManager is not trivial
to initialize (worst case scenario it starts a thread and does multiple
Binder requests), and ConnectivityManager is created in ActivityThread
when setting up the app proxy on startup.

Bug: 190556328
Test: atest FrameworksNetTests CtsNetTestCases TetheringTests
Change-Id: I2ba7b8f2b9e1c934cfb082776b8d643f2f2c17e5
2021-06-21 10:59:14 +09:00
lucaslin
0639afa9ca Add CTS for isUidNetworkingBlocked & isUidRestrictedOnMeteredNetworks
BYPASS_INCLUSIVE_LANGUAGE_REASON=To make the change more clear,
fix the inclusive problem in a follow-up commit.
Bug: 176289731
Test: atest CtsHostsideNetworkTests:HostsideNetworkPolicyManagerTests
Change-Id: Ie6bda8570979b10a28dbeb20f6db7a9c44735964
2021-06-20 07:43:06 +00:00
Xin Li
e7fde0c39a DO NOT MERGE - Merge RQ3A.210605.005
Bug: 190855093
Merged-In: I524644366a398b34de8f659d0d0d275f3f513c0c
Change-Id: I19bfd3cbd9f65d7936d9cbcbd840c96009f3a575
2021-06-18 12:24:45 -07:00
markchien
76e2e1c702 Add enable and disable ip serving common functions
This is a op CL which prepare for refactor.

Bug: 185649441
Bug: 189410000
Bug: 178116595

Test: atest TetheringTests
Change-Id: I270ff43c01736b9d18bd40a8e88e1379e9e4e863
2021-06-18 21:35:40 +08:00
markchien
cab01b7ebc Allow to use ncm function for usb tethering
Adding the configuration to decide using rndis or ncm for usb tethering.
If ncm is configured for TETHEIRNG_USB, then TETHERING_NCM is not
available.

Bug: 162920185
Test: atest TetheringTests
      manul testing usb tethering
Change-Id: Ifc7eee2457a950a0e2d1c3cc89a3373a7ad23c9c
2021-06-18 11:20:26 +08:00
Yan Yan
76aa81debf Test updating underlying network of IpSecTunnelInterface
This CL adds tests to verify that after setting
IpSecTunnelInterface to use a different undelying network and
re-applying IpSecTransforms with matching addresses, traffic
can be routed to/from the new underlying network.

All these new tests will be skipped if SDK < S

Bug: 169855650
Test: atest IpSecManagerTunnelTest (new tests added)
Change-Id: Iab26159e5e070574e552d62e4f0780059a51a9c7
2021-06-17 18:16:30 -07:00
lucaslin
56bc7d4dde Use assertEquals instead of assertTrue to compare the vpn type
Bug: 184261389
Test: atest CtsHostsideNetworkTests:HostsideVpnTests#testDefault
Change-Id: I55371fabe0d2fa32a71520af11f18f1eeea31460
2021-06-17 19:43:08 +08:00
James Mattis
4dad9710e1 Updating timeout for Per-App CTS
Increasing the timeout values for waiting for callbacks for the per-app
CTS tests to match the timeout value used in the waitForAvailable()
helper method.

Bug: 191230288
Test: atest CtsNetTestCases:android.net.cts.ConnectivityManagerTest
Change-Id: I49e5a99f18a5651370e6914f30be659134b537ff
2021-06-16 19:11:45 -07:00
Chiachang Wang
d6d3bf0b89 Merge "Add test for CM#setAcceptUnvalidated" am: 27586f8210
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1731234

Change-Id: I524644366a398b34de8f659d0d0d275f3f513c0c
2021-06-16 15:29:47 +00:00
Chiachang Wang
98e8422124 Merge "Add test for CM#setAcceptPartialConnectivity" am: 2693dc2696
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1730545

Change-Id: I702a17935b7e0a29d5c45e5ae6bd7ccf3c76eccd
2021-06-16 15:29:37 +00:00
Chiachang Wang
27586f8210 Merge "Add test for CM#setAcceptUnvalidated" 2021-06-16 15:17:51 +00:00
Chiachang Wang
2693dc2696 Merge "Add test for CM#setAcceptPartialConnectivity" 2021-06-16 15:17:37 +00:00
Remi NGUYEN VAN
c3d789bff1 Merge "Make tests compatible with mockito-extended" am: ad7108ce34
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1737400

Change-Id: I3c6de9b5da64e3bb26b1dc75e9184cf373d313fe
2021-06-16 13:34:34 +00:00
Remi NGUYEN VAN
ad7108ce34 Merge "Make tests compatible with mockito-extended" 2021-06-16 13:22:37 +00:00