Aaron Huang
caef428e57
Merge "CTS test for PacProxyManager" am: b93396edfb am: 7320aefbdd am: b31181a37c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1705131
Change-Id: I4a432ad05465171a90f58644a9c64dfc1ec25d22
2021-06-21 16:23:20 +00:00
Xin Li
f78f7cdc8e
[automerger skipped] DO NOT MERGE - Merge RQ3A.210605.005 am: e7fde0c39a -s ours am: 5ba981c20a -s ours am: 81d2adca15 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1741406
Change-Id: I559a987aa2bcc7102d81975609bf8d9cf701773e
2021-06-21 16:14:32 +00:00
Treehugger Robot
ae3fb7362c
Add CTS for setProfileNetworkPreference am: bd595f739c am: af1f7c528d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15044618
Change-Id: I8629e8e369fceddc8d2380e7afaf79362b5df9f3
2021-06-21 14:50:21 +00:00
Treehugger Robot
af1f7c528d
Add CTS for setProfileNetworkPreference am: bd595f739c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15044618
Change-Id: Ifb59930da0feb99477f5e4b8112248c19aa8f64a
2021-06-21 14:33:14 +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
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
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
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
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
Lucas Lin
07793f62a4
[automerger skipped] Merge "Send a proxy broadcast when apps moved from/to a VPN" into sc-dev am: 1b64ae6b87 -s ours am: 996e157558 -s ours
...
am skip reason: Merged-In Ifa103dd66394026d752b407a1bee740c9fcdad2b with SHA-1 950a65f8cc is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14730714
Change-Id: I527417c63ad63eb3b9b3586c668636ff997d9fb1
2021-06-18 03:15:22 +00:00
Automerger Merge Worker
971d2e275c
Merge "[automerger skipped] Merge "Add a test to check if the VPN type is set or not" into sc-dev am: 013cf220f0 -s ours am: 63f7b0c405 -s ours" into sc-v2-dev-plus-aosp
2021-06-18 03:15:17 +00:00
Lucas Lin
b701b221db
[automerger skipped] Merge "Send a proxy broadcast when apps moved from/to a VPN" into sc-dev am: 1b64ae6b87 am: 0842b6f551 -s ours
...
am skip reason: Merged-In Ifa103dd66394026d752b407a1bee740c9fcdad2b with SHA-1 53e8a267ab is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14730714
Change-Id: I347272cf82185d7abf011bc28965c15513af4f53
2021-06-18 03:14:59 +00:00
Lucas Lin
3647c01f40
[automerger skipped] Merge "Add a test to check if the VPN type is set or not" into sc-dev am: 013cf220f0 -s ours am: 63f7b0c405 -s ours
...
am skip reason: Merged-In I7ed5989ec767494c1033dc01242b32724e120c4e with SHA-1 b63f479a02 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14965961
Change-Id: I4d3936f7c5b8376cedce975da5130826974fa0a4
2021-06-18 03:14:57 +00:00
Lucas Lin
c57546985a
[automerger skipped] Merge "Add a test to check if the VPN type is set or not" into sc-dev am: 013cf220f0 am: 7d409ae0c5 -s ours
...
am skip reason: Merged-In I7ed5989ec767494c1033dc01242b32724e120c4e with SHA-1 816cc626c8 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14965961
Change-Id: I35354928257f614c7983ac4dc8610255ef3ea0d5
2021-06-18 03:14:51 +00:00
Lucas Lin
0842b6f551
Merge "Send a proxy broadcast when apps moved from/to a VPN" into sc-dev am: 1b64ae6b87
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14730714
Change-Id: I4b5e26981f464e97613308163ba2647730905f4c
2021-06-18 03:02:28 +00:00
Lucas Lin
7d409ae0c5
Merge "Add a test to check if the VPN type is set or not" into sc-dev am: 013cf220f0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14965961
Change-Id: I3988e8d3df6819e5ef233e8c235488a17131f1b3
2021-06-18 03:02:06 +00:00
Lucas Lin
996e157558
[automerger skipped] Merge "Send a proxy broadcast when apps moved from/to a VPN" into sc-dev am: 1b64ae6b87 -s ours
...
am skip reason: Merged-In Ifa103dd66394026d752b407a1bee740c9fcdad2b with SHA-1 53e8a267ab is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14730714
Change-Id: I2670aec83b31599e59dcd5f0e55474cdd13f253b
2021-06-18 03:00:52 +00:00
Lucas Lin
63f7b0c405
[automerger skipped] Merge "Add a test to check if the VPN type is set or not" into sc-dev am: 013cf220f0 -s ours
...
am skip reason: Merged-In I7ed5989ec767494c1033dc01242b32724e120c4e with SHA-1 816cc626c8 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14965961
Change-Id: I734b02a07f5b9ab4c5602e2b0741da45ac553187
2021-06-18 03:00:41 +00:00
Lucas Lin
1b64ae6b87
Merge "Send a proxy broadcast when apps moved from/to a VPN" into sc-dev
2021-06-18 02:47:24 +00:00
Lucas Lin
013cf220f0
Merge "Add a test to check if the VPN type is set or not" into sc-dev
2021-06-18 02:46:50 +00:00
Frank Li
4a64b60107
[automerger skipped] Merge "Add CTS test for NetworkRequest.getCapabilities API" into sc-dev am: 799d1c6053 -s ours am: 8e6e5177a6 -s ours
...
am skip reason: Merged-In I8504caa586bdb567d42047a96029dedc67968793 with SHA-1 f8e2e20f32 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15013235
Change-Id: I0aa42e1b65155195a56b85af56a35053bd4b89e5
2021-06-18 02:13:27 +00:00
Frank Li
49ecb4246e
[automerger skipped] Merge "Add test for ConnectivityService API isPrivateDnsBroken" into sc-dev am: 9097aaf5db -s ours am: ba2a31fab3 -s ours
...
am skip reason: Merged-In Ib45aa439683d48360652a91d7a0609dc82adda33 with SHA-1 3a48843e49 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15013234
Change-Id: I3794e49452a390dc3d52cc14ce192b50b2cf6084
2021-06-18 02:13:22 +00:00
Frank Li
df7cb63958
[automerger skipped] Merge "Add CTS test for NetworkRequest.getCapabilities API" into sc-dev am: 799d1c6053 am: 93c4f4cc2d -s ours
...
am skip reason: Merged-In I8504caa586bdb567d42047a96029dedc67968793 with SHA-1 50d8cd23d9 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15013235
Change-Id: I12ee949cc5bc3d1a7ac34656cb1766aab6cf509a
2021-06-18 02:13:13 +00:00
Frank Li
94eb68721f
[automerger skipped] Merge "Add test for ConnectivityService API isPrivateDnsBroken" into sc-dev am: 9097aaf5db am: ab46d66d0d -s ours
...
am skip reason: Merged-In Ib45aa439683d48360652a91d7a0609dc82adda33 with SHA-1 e39741db1c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15013234
Change-Id: Iebd51a809fe8db6822201a4e7f9d47189c94f53c
2021-06-18 02:13:07 +00:00
Frank Li
ae28ddab50
[automerger skipped] Merge "Add CTS test for API setLegacyExtraInfo" into sc-dev am: a9602dc5d3 -s ours am: acddaabfff -s ours
...
am skip reason: Merged-In Ief14f6de0cb6913da944414f0b134eb04346425f with SHA-1 b7eebde98a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15013233
Change-Id: If0951965f6ef8eb9b09cfcb689e23f0ff3b344ef
2021-06-18 02:13:01 +00:00
Frank Li
c045f111c8
[automerger skipped] Merge "Add CTS test for API setLegacyExtraInfo" into sc-dev am: a9602dc5d3 am: ee4006fa06 -s ours
...
am skip reason: Merged-In Ief14f6de0cb6913da944414f0b134eb04346425f with SHA-1 0fd78de2c6 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15013233
Change-Id: Ib2b5de97323c2be0b77c4412c69f00ea0f35c500
2021-06-18 02:12:39 +00:00
Frank Li
93c4f4cc2d
Merge "Add CTS test for NetworkRequest.getCapabilities API" into sc-dev am: 799d1c6053
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15013235
Change-Id: I8aa95782a699b6b711441e47adb7056a449986a3
2021-06-18 01:57:57 +00:00
Frank Li
ab46d66d0d
Merge "Add test for ConnectivityService API isPrivateDnsBroken" into sc-dev am: 9097aaf5db
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15013234
Change-Id: Ia41376d391cdfa3444b4a46ae003d315bbfc45f9
2021-06-18 01:57:43 +00:00
Frank Li
ee4006fa06
Merge "Add CTS test for API setLegacyExtraInfo" into sc-dev am: a9602dc5d3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15013233
Change-Id: I39ebd7e74d548971af7e6581ce77f32b9be82208
2021-06-18 01:57:18 +00:00
Frank Li
8e6e5177a6
[automerger skipped] Merge "Add CTS test for NetworkRequest.getCapabilities API" into sc-dev am: 799d1c6053 -s ours
...
am skip reason: Merged-In I8504caa586bdb567d42047a96029dedc67968793 with SHA-1 50d8cd23d9 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15013235
Change-Id: I545eb6070ba5ff8da9122339719041754e39be27
2021-06-18 01:56:32 +00:00
Frank Li
ba2a31fab3
[automerger skipped] Merge "Add test for ConnectivityService API isPrivateDnsBroken" into sc-dev am: 9097aaf5db -s ours
...
am skip reason: Merged-In Ib45aa439683d48360652a91d7a0609dc82adda33 with SHA-1 e39741db1c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15013234
Change-Id: I9049636fee0c1d402094350ee43f80dcf7c78e57
2021-06-18 01:56:27 +00:00
Frank Li
acddaabfff
[automerger skipped] Merge "Add CTS test for API setLegacyExtraInfo" into sc-dev am: a9602dc5d3 -s ours
...
am skip reason: Merged-In Ief14f6de0cb6913da944414f0b134eb04346425f with SHA-1 0fd78de2c6 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15013233
Change-Id: I576083eea68317716d7fcd278d489e03664fbaaf
2021-06-18 01:56:02 +00:00
Frank Li
799d1c6053
Merge "Add CTS test for NetworkRequest.getCapabilities API" into sc-dev
2021-06-18 01:37:20 +00:00
Frank Li
9097aaf5db
Merge "Add test for ConnectivityService API isPrivateDnsBroken" into sc-dev
2021-06-18 01:37:08 +00:00
Frank Li
a9602dc5d3
Merge "Add CTS test for API setLegacyExtraInfo" into sc-dev
2021-06-18 01:36:44 +00:00
James Mattis
5df769ffed
[automerger skipped] Merge "Update CS so that per-app OEM APIs can be tested" into sc-dev am: 24ab50b086 -s ours am: 6b23638b99 -s ours
...
am skip reason: Merged-In I5a47dcece31749293f080af060218d827082eb67 with SHA-1 b7ca034306 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14993471
Change-Id: I798d6b12750270b9312cee54f1d019c05acc7689
2021-06-17 16:41:18 +00:00
James Mattis
c0101eac82
[automerger skipped] Merge "Update CS so that per-app OEM APIs can be tested" into sc-dev am: 24ab50b086 am: a4e465da0b -s ours
...
am skip reason: Merged-In I5a47dcece31749293f080af060218d827082eb67 with SHA-1 fa270db5f7 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14993471
Change-Id: I9105cd250812118609f36cf8e4af9922bef04bd4
2021-06-17 16:40:58 +00:00
James Mattis
a4e465da0b
Merge "Update CS so that per-app OEM APIs can be tested" into sc-dev am: 24ab50b086
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14993471
Change-Id: I0f8b1a947ca6e738bc21ee2c49e2412b2f99997d
2021-06-17 16:28:42 +00:00
James Mattis
6b23638b99
[automerger skipped] Merge "Update CS so that per-app OEM APIs can be tested" into sc-dev am: 24ab50b086 -s ours
...
am skip reason: Merged-In I5a47dcece31749293f080af060218d827082eb67 with SHA-1 fa270db5f7 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14993471
Change-Id: I1183777cab37fadd8a335f66cca13e95fcaca158
2021-06-17 16:27:27 +00:00
James Mattis
24ab50b086
Merge "Update CS so that per-app OEM APIs can be tested" into sc-dev
2021-06-17 16:08:58 +00:00
Frank Li
f8e2e20f32
Add CTS test for NetworkRequest.getCapabilities API
...
Bug: 189162033
Test: atest android.net.cts.NetworkRequestTest
atest CtsNetTestCasesLatestSdk:NetworkRequestTest
Original-Change: https://android-review.googlesource.com/1717737
Merged-In: I8504caa586bdb567d42047a96029dedc67968793
Change-Id: I8504caa586bdb567d42047a96029dedc67968793
2021-06-17 13:42:34 +00:00
Frank Li
3a48843e49
Add test for ConnectivityService API isPrivateDnsBroken
...
Bug: 189161363
Test: atest android.net.cts.ConnectivityManagerTest
atest CtsNetTestCasesLatestSdk:ConnectivityManagerTest
Original-Change: https://android-review.googlesource.com/1719395
Merged-In: Ib45aa439683d48360652a91d7a0609dc82adda33
Change-Id: Ib45aa439683d48360652a91d7a0609dc82adda33
2021-06-17 13:22:39 +00:00
Frank Li
b7eebde98a
Add CTS test for API setLegacyExtraInfo
...
Adding in-depth test in NetworkAgentTest
Bug: 187040803
Test: atest CtsNetTestCasesLatestSdk:android.net.NetworkAgentConfigTest
atest CtsNetTestCases:android.net.NetworkAgentConfigTest
Original-Change: https://android-review.googlesource.com/1719131
Merged-In: Ief14f6de0cb6913da944414f0b134eb04346425f
Change-Id: Ief14f6de0cb6913da944414f0b134eb04346425f
2021-06-17 13:00:57 +00:00
Lucas Lin
b63f479a02
Add a test to check if the VPN type is set or not
...
Bug: 184261389
Test: atest CtsHostsideNetworkTests:HostsideVpnTests#testDefault
Original-Change: https://android-review.googlesource.com/1733785
Merged-In: I7ed5989ec767494c1033dc01242b32724e120c4e
Change-Id: I7ed5989ec767494c1033dc01242b32724e120c4e
2021-06-17 11:15:17 +00:00
Lucas Lin
950a65f8cc
Send a proxy broadcast when apps moved from/to a VPN
...
When the apps moved from/to a VPN, a proxy broadcast is needed to
inform the apps that the proxy might be changed since the default
network satisfied by the apps might also changed.
Since the framework does not track the defautlt network of every
apps, thus, this is done when:
1. VPN connects/disconnects.
2. List of uids that apply to the VPN has changed.
While 1 is already covered by the current design, the CL implements
2 in order to fulfill the case that different networks have
different proxies.
Bug: 178727215
Test: atest FrameworksNetTests
Original-Change: https://android-review.googlesource.com/1717735
Merged-In: Ifa103dd66394026d752b407a1bee740c9fcdad2b
Change-Id: Ifa103dd66394026d752b407a1bee740c9fcdad2b
2021-06-17 11:10:46 +00:00
Junyu Lai
2d20d2a184
[automerger skipped] Fix expectCallback does not fail when no callback received am: 52e3fa127a -s ours am: 22a9c63234 -s ours
...
am skip reason: Merged-In I627dcd0f57b6ef4197d16e6c1ec0c53e675ab055 with SHA-1 52e3fa127a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14683929
Change-Id: Iec4ae32af71c8cbed57697733c88e0d7e202dba4
2021-06-17 10:52:10 +00:00
Junyu Lai
8039db731a
[automerger skipped] Add CTS for registerBestMatchingNetworkCallback am: 512efafd32 -s ours am: eb50be9103 -s ours
...
am skip reason: Merged-In I81abc1742a3aa965b444d0196f4eaa2393dcad1c with SHA-1 512efafd32 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14673220
Change-Id: Icb7cacf12d3f2000b650b7f993a4e89af46c4b07
2021-06-17 10:52:08 +00:00
Junyu Lai
54bb7c9ed6
[automerger skipped] No-op refactoring of NetworkAgentTest am: e5bdc06735 -s ours am: c0b2c8af16 -s ours
...
am skip reason: Merged-In Id7948d218b78ae0abf253ca8925e787362ac463f with SHA-1 e5bdc06735 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14662648
Change-Id: Ib65c0bff5a07638e9335b02dc2494f7e3d6a6176
2021-06-17 10:52:06 +00:00