Commit Graph

10177 Commits

Author SHA1 Message Date
Cody Kesting
eaa001b991 [automerger skipped] Merge "Create TestApi for simulating a Data Stall on ConnectivityService." into rvc-dev am: 8ed33c51f1 -s ours am: 49ea39e137 -s ours am: f62cbeaf8d -s ours
am skip reason: Change-Id Icad439efa2ab4c872c21d3ee6ceaae8c5b49f18d with SHA-1 9ddf8a5953 is in history

Change-Id: Icdad1a09f60a11cbf9dc8e49dd4565f370da8ec5
2020-05-15 16:39:18 +00:00
Cody Kesting
0bfee73003 [automerger skipped] Merge "Set owner and administrator UIDs for test networks." into rvc-dev am: 05d04fe553 -s ours am: 4cf3195976 -s ours am: 4b6cd6a586 -s ours
am skip reason: Change-Id I3a974700aa1d83cb285295ed1de0aa263e2e5b58 with SHA-1 a9b761d261 is in history

Change-Id: I9aaa2b99a80d7589f7e34a4543aa0ba73109889e
2020-05-15 16:39:08 +00:00
Cody Kesting
2b1b1c8076 [automerger skipped] Merge "Create TestApi for simulating a Data Stall on ConnectivityService." into rvc-dev am: 8ed33c51f1 am: afa449c852 -s ours am: adac80cf27 -s ours
am skip reason: Change-Id Icad439efa2ab4c872c21d3ee6ceaae8c5b49f18d with SHA-1 9ddf8a5953 is in history

Change-Id: I3e4262c358cf911c637dd518730ce4274efab587
2020-05-15 16:13:47 +00:00
Cody Kesting
bcc7999869 [automerger skipped] Merge "Set owner and administrator UIDs for test networks." into rvc-dev am: 05d04fe553 am: 2b628e49d4 -s ours am: dcbe2a47df -s ours
am skip reason: Change-Id I3a974700aa1d83cb285295ed1de0aa263e2e5b58 with SHA-1 a9b761d261 is in history

Change-Id: I5a40a74c489c782151a20f07a23177500b76e2fa
2020-05-15 16:13:37 +00:00
Cody Kesting
f62cbeaf8d [automerger skipped] Merge "Create TestApi for simulating a Data Stall on ConnectivityService." into rvc-dev am: 8ed33c51f1 -s ours am: 49ea39e137 -s ours
am skip reason: Change-Id Icad439efa2ab4c872c21d3ee6ceaae8c5b49f18d with SHA-1 9ddf8a5953 is in history

Change-Id: I1d5f1c2a7059dfc15348126213f620666fdab83a
2020-05-15 16:11:33 +00:00
Cody Kesting
4b6cd6a586 [automerger skipped] Merge "Set owner and administrator UIDs for test networks." into rvc-dev am: 05d04fe553 -s ours am: 4cf3195976 -s ours
am skip reason: Change-Id I3a974700aa1d83cb285295ed1de0aa263e2e5b58 with SHA-1 a9b761d261 is in history

Change-Id: Ibdd6d03a7e98bcc30be1832321a3cfe434cd1082
2020-05-15 16:11:25 +00:00
Cody Kesting
49ea39e137 [automerger skipped] Merge "Create TestApi for simulating a Data Stall on ConnectivityService." into rvc-dev am: 8ed33c51f1 -s ours
am skip reason: Change-Id Icad439efa2ab4c872c21d3ee6ceaae8c5b49f18d with SHA-1 f53a075913 is in history

Change-Id: Idb6ea8087b39242e1bab79d7227107303a81f59d
2020-05-15 15:56:40 +00:00
Cody Kesting
4cf3195976 [automerger skipped] Merge "Set owner and administrator UIDs for test networks." into rvc-dev am: 05d04fe553 -s ours
am skip reason: Change-Id I3a974700aa1d83cb285295ed1de0aa263e2e5b58 with SHA-1 fc7cad313d is in history

Change-Id: I378c8d86396f0a8ddb803b86ef8426b4dca1c153
2020-05-15 15:56:20 +00:00
Cody Kesting
c30f8d47af [automerger skipped] Merge "Create TestApi for simulating a Data Stall on ConnectivityService." into rvc-dev am: 8ed33c51f1 am: afa449c852 am: a42615900f -s ours
am skip reason: Change-Id Icad439efa2ab4c872c21d3ee6ceaae8c5b49f18d with SHA-1 f53a075913 is in history

Change-Id: I9dd9b553b718182482e270776f9ec5a2a163a6cc
2020-05-15 15:53:40 +00:00
Cody Kesting
be9731b619 [automerger skipped] Merge "Set owner and administrator UIDs for test networks." into rvc-dev am: 05d04fe553 am: 2b628e49d4 am: 628481939a -s ours
am skip reason: Change-Id I3a974700aa1d83cb285295ed1de0aa263e2e5b58 with SHA-1 fc7cad313d is in history

Change-Id: Ibc079b93fe6a2183220fdd57d0d41cbda772c400
2020-05-15 15:53:30 +00:00
Cody Kesting
adac80cf27 [automerger skipped] Merge "Create TestApi for simulating a Data Stall on ConnectivityService." into rvc-dev am: 8ed33c51f1 am: afa449c852 -s ours
am skip reason: Change-Id Icad439efa2ab4c872c21d3ee6ceaae8c5b49f18d with SHA-1 f53a075913 is in history

Change-Id: I92ebe59e56a221d9f998286dc9a6d8d1993b12a0
2020-05-15 15:51:31 +00:00
Cody Kesting
dcbe2a47df [automerger skipped] Merge "Set owner and administrator UIDs for test networks." into rvc-dev am: 05d04fe553 am: 2b628e49d4 -s ours
am skip reason: Change-Id I3a974700aa1d83cb285295ed1de0aa263e2e5b58 with SHA-1 fc7cad313d is in history

Change-Id: I7009a06d57286347c5fae2355132d2f217863383
2020-05-15 15:51:19 +00:00
Treehugger Robot
f801a1ac69 Merge "Address nit from aosp/1301317" am: 1894a79964 am: 2dc15b02b2 am: 4e94c06d29 am: b18e0bfd47
Change-Id: I40af839b2c1838d1fa2a5298197b94d401b62a1e
2020-05-15 08:02:25 +00:00
Treehugger Robot
b18e0bfd47 Merge "Address nit from aosp/1301317" am: 1894a79964 am: 2dc15b02b2 am: 4e94c06d29
Change-Id: Ib5bb0a7349523274f825832a7fc71aa9ed95b764
2020-05-15 07:43:42 +00:00
Treehugger Robot
4e94c06d29 Merge "Address nit from aosp/1301317" am: 1894a79964 am: 2dc15b02b2
Change-Id: I7ae9b80954309b18eb6923da3aeaab3d1b8e3231
2020-05-15 07:14:29 +00:00
Treehugger Robot
2dc15b02b2 Merge "Address nit from aosp/1301317" am: 1894a79964
Change-Id: I2443c5da4b69bce693a39e894c41db5b25b6cf03
2020-05-15 07:03:31 +00:00
Treehugger Robot
1894a79964 Merge "Address nit from aosp/1301317" 2020-05-15 06:43:42 +00:00
Benedict Wong
4072afdccc Merge "Add methods for IKEv2/IPsec test mode profiles" am: 56b98b0206 am: 099b0b8700 am: 317aa920aa am: 2d5ae08cc9
Change-Id: I73284b878b9622992c2773b4efd9297ae71e07fc
2020-05-15 03:29:53 +00:00
Benedict Wong
2d5ae08cc9 Merge "Add methods for IKEv2/IPsec test mode profiles" am: 56b98b0206 am: 099b0b8700 am: 317aa920aa
Change-Id: I03dd060ae9de05f9491a37f321faacdadab73965
2020-05-15 03:12:05 +00:00
Benedict Wong
317aa920aa Merge "Add methods for IKEv2/IPsec test mode profiles" am: 56b98b0206 am: 099b0b8700
Change-Id: I353d999ebcdd108a900abfe20be232e83147b6d2
2020-05-15 02:51:43 +00:00
Benedict Wong
099b0b8700 Merge "Add methods for IKEv2/IPsec test mode profiles" am: 56b98b0206
Change-Id: I9ff22188a641fce6b7bd44f7619d1b825988667a
2020-05-15 02:35:39 +00:00
Benedict Wong
56b98b0206 Merge "Add methods for IKEv2/IPsec test mode profiles" 2020-05-15 02:18:02 +00:00
Cody Kesting
afa449c852 Merge "Create TestApi for simulating a Data Stall on ConnectivityService." into rvc-dev am: 8ed33c51f1
Change-Id: I126dd23216a3a42a9745a2c97e26ac2599e307e1
2020-05-14 19:19:13 +00:00
Cody Kesting
2b628e49d4 Merge "Set owner and administrator UIDs for test networks." into rvc-dev am: 05d04fe553
Change-Id: Ia17090a6a00b878235d512a80e59d9f58fd1cbd9
2020-05-14 19:18:26 +00:00
Cody Kesting
8ed33c51f1 Merge "Create TestApi for simulating a Data Stall on ConnectivityService." into rvc-dev 2020-05-14 18:56:36 +00:00
Cody Kesting
05d04fe553 Merge "Set owner and administrator UIDs for test networks." into rvc-dev 2020-05-14 18:56:16 +00:00
Automerger Merge Worker
6ea3bb8270 Merge "[automerger skipped] Merge "Use the new NetworkStackConnector constructor" into rvc-dev am: 2404bc617a -s ours am: 83bc7a6c91 -s ours" into rvc-d1-dev-plus-aosp am: 3b05e7f649 -s ours
am skip reason: Change-Id I46f247268310e12d420531745a22e93cf3550e89 with SHA-1 05c7af6c7c is in history

Change-Id: I901d2b1c78b526a470bce67b3c935195758bc06d
2020-05-14 00:51:59 +00:00
Remi NGUYEN VAN
a8f2dbb7ae [automerger skipped] Merge "Use the new NetworkStackConnector constructor" into rvc-dev am: 2404bc617a am: 778914e606 -s ours am: 22a2db7267 -s ours
am skip reason: Change-Id I46f247268310e12d420531745a22e93cf3550e89 with SHA-1 05c7af6c7c is in history

Change-Id: Ic06de69f6d9ac8e16c89334ed8a173745b8ae342
2020-05-14 00:51:31 +00:00
Remi NGUYEN VAN
14ad50be58 [automerger skipped] Merge "Use the new NetworkStackConnector constructor" into rvc-dev am: 2404bc617a am: 778914e606 am: 52c36113ab -s ours
am skip reason: Change-Id I46f247268310e12d420531745a22e93cf3550e89 with SHA-1 a065d07edf is in history

Change-Id: Ia551efed2721e9bc2be6a4c59f8296b15ba91d56
2020-05-14 00:50:36 +00:00
Automerger Merge Worker
3b05e7f649 Merge "[automerger skipped] Merge "Use the new NetworkStackConnector constructor" into rvc-dev am: 2404bc617a -s ours am: 83bc7a6c91 -s ours" into rvc-d1-dev-plus-aosp 2020-05-14 00:32:24 +00:00
Remi NGUYEN VAN
8953bd899c [automerger skipped] Merge "Use the new NetworkStackConnector constructor" into rvc-dev am: 2404bc617a -s ours am: 83bc7a6c91 -s ours
am skip reason: Change-Id I46f247268310e12d420531745a22e93cf3550e89 with SHA-1 a065d07edf is in history

Change-Id: I0d305ee3fbab44cbb47c15da376ad5731f54e379
2020-05-14 00:32:17 +00:00
Remi NGUYEN VAN
22a2db7267 [automerger skipped] Merge "Use the new NetworkStackConnector constructor" into rvc-dev am: 2404bc617a am: 778914e606 -s ours
am skip reason: Change-Id I46f247268310e12d420531745a22e93cf3550e89 with SHA-1 a065d07edf is in history

Change-Id: I79c066b158eb693ff3aef5dcae35f6634796aa4f
2020-05-14 00:32:16 +00:00
Remi NGUYEN VAN
778914e606 Merge "Use the new NetworkStackConnector constructor" into rvc-dev am: 2404bc617a
Change-Id: Icf470e9e5f308a6575c98ad2f9f4a867c3e32e1e
2020-05-14 00:12:22 +00:00
Remi NGUYEN VAN
83bc7a6c91 [automerger skipped] Merge "Use the new NetworkStackConnector constructor" into rvc-dev am: 2404bc617a -s ours
am skip reason: Change-Id I46f247268310e12d420531745a22e93cf3550e89 with SHA-1 a065d07edf is in history

Change-Id: I6e4c65d2d8fb53a2f39d2c94e020f171f50de2b2
2020-05-14 00:12:01 +00:00
Remi NGUYEN VAN
05c7af6c7c Use the new NetworkStackConnector constructor
The constructor was changed to allow for unit tests.

Bug: 137328719
Test: atest FrameworksNetIntegrationTests
Original-Change: https://android-review.googlesource.com/1295360
Merged-In: I46f247268310e12d420531745a22e93cf3550e89
Change-Id: I46f247268310e12d420531745a22e93cf3550e89
2020-05-13 09:18:52 +00:00
Benedict Wong
0d7bed76cb Add methods for IKEv2/IPsec test mode profiles
This change adds the ability for IKEv2/IPsec VPN profiles to run on Test
Networks. If enabled, the IKEv2/IPsec VPN profiles will request ONLY
test networks.

Bug: 148582947
Test: FrameworksNetTests passing
Test: Added for testing
Change-Id: I2511b39b27a1e29ae97907cdb12728d13fb1628f
2020-05-12 22:55:55 -07:00
Automerger Merge Worker
10733b5b63 Merge "[automerger skipped] Merge "Send full LinkProperties to NetworkMonitor" into rvc-dev am: d9e1872964 -s ours am: 5460972621 -s ours" into rvc-d1-dev-plus-aosp am: d021dfc531 -s ours
am skip reason: Change-Id Ifd4e9c02a6b9a2b2b8b254fc4da7bfb9e0a84550 with SHA-1 2c4a47d65c is in history

Change-Id: I881e4b6f0789df7fce7ce4ab1242bfda457a1b38
2020-05-13 01:17:32 +00:00
Automerger Merge Worker
bf9d7cb843 Merge "[automerger skipped] Merge "Send full LinkProperties to NetworkMonitor" into rvc-dev am: d9e1872964 am: 36951833e2 am: be7c169c70 -s ours" into rvc-qpr-dev-plus-aosp 2020-05-13 01:15:39 +00:00
Remi NGUYEN VAN
ee0902463d [automerger skipped] Merge "Send full LinkProperties to NetworkMonitor" into rvc-dev am: d9e1872964 am: 36951833e2 am: be7c169c70 -s ours
am skip reason: Change-Id Ifd4e9c02a6b9a2b2b8b254fc4da7bfb9e0a84550 with SHA-1 c9f24746f2 is in history

Change-Id: I18ffb2265247f2cd600e994cb18d9a085c30f764
2020-05-13 01:15:25 +00:00
Remi NGUYEN VAN
dd5b18160c [automerger skipped] Merge "Send full LinkProperties to NetworkMonitor" into rvc-dev am: d9e1872964 am: 36951833e2 -s ours am: 8dd5884110 -s ours
am skip reason: Change-Id Ifd4e9c02a6b9a2b2b8b254fc4da7bfb9e0a84550 with SHA-1 c9f24746f2 is in history

Change-Id: Id509afa23991606511134bb7d10f8cd2152add0d
2020-05-13 01:15:18 +00:00
Remi NGUYEN VAN
96a6b00ff9 [automerger skipped] Merge "Send full LinkProperties to NetworkMonitor" into rvc-dev am: d9e1872964 -s ours am: 5460972621 -s ours
am skip reason: Change-Id Ifd4e9c02a6b9a2b2b8b254fc4da7bfb9e0a84550 with SHA-1 2c4a47d65c is in history

Change-Id: I9b7431c4fd6dd21511222a3e71c07eb17265f1cf
2020-05-13 01:02:21 +00:00
Remi NGUYEN VAN
8dd5884110 [automerger skipped] Merge "Send full LinkProperties to NetworkMonitor" into rvc-dev am: d9e1872964 am: 36951833e2 -s ours
am skip reason: Change-Id Ifd4e9c02a6b9a2b2b8b254fc4da7bfb9e0a84550 with SHA-1 c9f24746f2 is in history

Change-Id: I57fe5219d620fd5935837db054954ccb8e73c36b
2020-05-13 01:01:20 +00:00
Remi NGUYEN VAN
5460972621 [automerger skipped] Merge "Send full LinkProperties to NetworkMonitor" into rvc-dev am: d9e1872964 -s ours
am skip reason: Change-Id Ifd4e9c02a6b9a2b2b8b254fc4da7bfb9e0a84550 with SHA-1 c9f24746f2 is in history

Change-Id: Ic5d0d8461cbaf0a75da92b47d2d0aaa7a7743fb6
2020-05-13 00:48:39 +00:00
Remi NGUYEN VAN
36951833e2 Merge "Send full LinkProperties to NetworkMonitor" into rvc-dev am: d9e1872964
Change-Id: I2ec432881b77f0b093fc4ced18fe775a91ae93d3
2020-05-13 00:48:30 +00:00
Remi NGUYEN VAN
d9e1872964 Merge "Send full LinkProperties to NetworkMonitor" into rvc-dev 2020-05-13 00:34:41 +00:00
Automerger Merge Worker
ccbe594a03 Merge "[automerger skipped] Merge changes I37dd459d,I1959f308 into rvc-dev am: 0cd6d1cb70 -s ours am: 6e6dad4cd1 -s ours" into rvc-d1-dev-plus-aosp am: 61ae308aba -s ours
am skip reason: Change-Id I37dd459d08b57b14f72f3b28ea80fa231b152f10 with SHA-1 bfd3c75dce is in history

Change-Id: Ie3884e88a5e1b7e8997da346c7984a6bf02b186f
2020-05-12 21:04:43 +00:00
Automerger Merge Worker
c1cd35ab13 [automerger skipped] Merge changes from topic "am-a4c996e50cb34a3bb257f059536b77ae" into rvc-d1-dev-plus-aosp am: 5f93a08607 -s ours
am skip reason: Change-Id I37dd459d08b57b14f72f3b28ea80fa231b152f10 with SHA-1 b645699cdb is in history

Change-Id: I0ea68069cd9e07bf2d95b14452046fdb63613782
2020-05-12 21:03:36 +00:00
Automerger Merge Worker
61ae308aba Merge "[automerger skipped] Merge changes I37dd459d,I1959f308 into rvc-dev am: 0cd6d1cb70 -s ours am: 6e6dad4cd1 -s ours" into rvc-d1-dev-plus-aosp 2020-05-12 20:47:07 +00:00
TreeHugger Robot
287064ab75 [automerger skipped] Merge changes I37dd459d,I1959f308 into rvc-dev am: 0cd6d1cb70 -s ours am: 6e6dad4cd1 -s ours
am skip reason: Change-Id I37dd459d08b57b14f72f3b28ea80fa231b152f10 with SHA-1 b645699cdb is in history

Change-Id: I439913a4195cea16832b3ec6c19a3cfaa63dfdb8
2020-05-12 20:47:02 +00:00
TreeHugger Robot
4d2bf48c26 [automerger skipped] Merge changes I37dd459d,I1959f308 into rvc-dev am: 0cd6d1cb70 am: 497e8f14fa -s ours
am skip reason: Change-Id I37dd459d08b57b14f72f3b28ea80fa231b152f10 with SHA-1 b645699cdb is in history

Change-Id: Ib9aaf9091937ae27f35a389cc3de696567cefe1b
2020-05-12 20:46:55 +00:00