Lucas Lin
da9c2fb600
Merge "Use assertEquals instead of assertTrue to compare the vpn type" am: 56055496f3 am: 9ca145bcfa
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1739093
Change-Id: Idb987331163fde7019febdcbf3e28bf205894d37
2021-06-22 00:02:15 +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
f602b03178
Merge "Add CTS for systemReady() & getIpSecNetIdRange()" am: 7e2a491835 am: 72d2223bf7
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1676425
Change-Id: I6cc3cc6f52ffb783bb21e3914b4eacd19756d755
2021-06-21 23:37:47 +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
833cb00abf
Merge "Call ConnectivitySettingsUtils to set/get private DNS related settings" am: c12550b9f4 am: 8f8e1512d6
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1719017
Change-Id: Ifbe743b2f1eccfb1e553e6521cc0a461a8a475d8
2021-06-21 20:51:42 +00:00
James Mattis
ed5d25d599
Merge "Updating timeout for Per-App CTS" am: 420072651d am: eaa493d033
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1736927
Change-Id: Ia7035d953fe0f073467b608b58aa06f65a313224
2021-06-21 20:50:56 +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
Sudheer Shanka
67a0ad8ce6
[automerger skipped] Merge "Avoid waiting unnecessarily if there is no data to return." into sc-dev am: 858dde4109 -s ours
...
am skip reason: Merged-In I091991aac8eb11319bd60dc8f07124ace1ad52f1 with SHA-1 f3d8c6f70e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15039587
Change-Id: I44d25f1cb3e93bcdbedf424927d42f2c4d1e16b1
2021-06-21 19:58:15 +00:00
Junyu Lai
35aeed5e5a
[automerger skipped] Add CTS for registerNetworkOffer am: cdb727ed50 -s ours
...
am skip reason: Merged-In Ic3ab3c487d8a9b5a9508b59f83ae35672307b933 with SHA-1 f20360649f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14730721
Change-Id: I328eecc56b928b84d259e66ca380163ad6b17214
2021-06-21 19:54:15 +00:00
Lucas Lin
c12550b9f4
Merge "Call ConnectivitySettingsUtils to set/get private DNS related settings"
2021-06-21 19:12:33 +00:00
Sudheer Shanka
858dde4109
Merge "Avoid waiting unnecessarily if there is no data to return." into sc-dev
2021-06-21 17:50:55 +00:00
James Mattis
420072651d
Merge "Updating timeout for Per-App CTS"
2021-06-21 17:17:13 +00:00
Treehugger Robot
16c4405446
[automerger skipped] Add CTS for setProfileNetworkPreference am: bd595f739c -s ours
...
am skip reason: Merged-In Ifffdf55addbb7ec4466d4adec61e5812b7f94320 with SHA-1 75b109586a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15044618
Change-Id: Ibb5e79f04f2b12392ce72d217f869b4f414854a6
2021-06-21 14:31:13 +00:00
Junyu Lai
cdb727ed50
Add CTS for registerNetworkOffer
...
Test: android.net.NetworkProviderTest on R/S device
Bug: 189074532
Original-Change: https://android-review.googlesource.com/1731451
Merged-In: Ic3ab3c487d8a9b5a9508b59f83ae35672307b933
Change-Id: Ic3ab3c487d8a9b5a9508b59f83ae35672307b933
2021-06-21 14:18:34 +00:00
Treehugger Robot
09733fd351
Merge "Add a test for ConnectivityFrameworkInitializer" am: aa397809e2 am: 62df9b8d06
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1675598
Change-Id: I703593eab8e45bfaa861b93f8b274c2e86e19a24
2021-06-21 13:58:04 +00:00
Treehugger Robot
353e4349d6
Merge "Add test for setHttpProxyConfiguration" am: bccd97f0b3 am: 9627dd29b5
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1564956
Change-Id: I6ca0bdecaf5c72847b5569fd4f6ff10abfc0cba4
2021-06-21 13:57:54 +00:00
Junyu Lai
11ccd1531f
Merge "Add CTS for registerNetworkOffer" am: f92979bd5b am: 26bb0a84a6
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1731451
Change-Id: I07371bcb29bd2646d9b72396a92e5c397e4a1f16
2021-06-21 13:57:37 +00:00
Mark Chien
0e57c7e589
Merge changes I270ff43c,Ifc7eee24 am: cec294d1b4 am: 82b26e0d1f
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1730548
Change-Id: I382f551487f70865761b4dcd0dcdcdb425538f3e
2021-06-21 13:57:31 +00:00
Remi NGUYEN VAN
3d25f6e8a7
Merge "Add connectivity coverage tests" am: cc79d7c0f8 am: 68114fe408
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1731232
Change-Id: I6cc7f3a3abe97fccc59e14e77e99a0843f3363bb
2021-06-21 13:56:37 +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
bd595f739c
Add CTS for setProfileNetworkPreference
...
Test: atest android.net.cts.ConnectivityManagerTest
Bug: 190797743
Original-Change: https://android-review.googlesource.com/1733784
Merged-In: Ifffdf55addbb7ec4466d4adec61e5812b7f94320
Change-Id: Ifffdf55addbb7ec4466d4adec61e5812b7f94320
2021-06-21 11:05:54 +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
b8a0916175
Merge "Add CTS for setProfileNetworkPreference" am: 5d4f701244 am: 106a4752f7
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1733784
Change-Id: I7bd055c546c550c72b367b22adb3a2b2698c0cd9
2021-06-21 10:35:56 +00:00
Remi NGUYEN VAN
381358371f
Merge "Allow mocking permission in TetheringServiceTest" am: ec48bb82aa am: 4abe3f8db3
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1731231
Change-Id: Ic54d721af3ea589f3383cfe9c6dfb32928ba80ac
2021-06-21 10:35:50 +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
Remi NGUYEN VAN
d061ad4a60
Merge "Initialize TetheringManager lazily" am: 7c5902df7e am: b0504221b4
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1736505
Change-Id: I828ded55c5d478808abffda4259248cfcad7586c
2021-06-21 10:34:22 +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
Aaron Huang
b31181a37c
Merge "CTS test for PacProxyManager" am: b93396edfb am: 7320aefbdd
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1705131
Change-Id: Ibd6bef57f66c6c793271f0315c4336b187ffc048
2021-06-21 10:14:21 +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
Xin Li
81d2adca15
[automerger skipped] DO NOT MERGE - Merge RQ3A.210605.005 am: e7fde0c39a -s ours am: 5ba981c20a -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: Icdf0f317488c7b1b7f39acffdd5b1f1219ecf51d
2021-06-21 06:42:44 +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
Sudheer Shanka
c017d9adf3
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
Merged-In: I091991aac8eb11319bd60dc8f07124ace1ad52f1
2021-06-21 05:36:26 +00:00