Commit Graph

10522 Commits

Author SHA1 Message Date
Treehugger Robot
cda9dbd5aa Merge "Address nit from aosp/1301317" am: 14a5bf9510 am: 7b20fde8c9 am: b0af0ee400 am: 7af6037609 am: 02e86a3687
Change-Id: Id24f6eadf126616a8585ce56aef0de7f1c68c44b
2020-05-15 08:15:35 +00:00
Treehugger Robot
02e86a3687 Merge "Address nit from aosp/1301317" am: 14a5bf9510 am: 7b20fde8c9 am: b0af0ee400 am: 7af6037609
Change-Id: I40af839b2c1838d1fa2a5298197b94d401b62a1e
2020-05-15 08:02:25 +00:00
Treehugger Robot
7af6037609 Merge "Address nit from aosp/1301317" am: 14a5bf9510 am: 7b20fde8c9 am: b0af0ee400
Change-Id: Ib5bb0a7349523274f825832a7fc71aa9ed95b764
2020-05-15 07:43:42 +00:00
Treehugger Robot
b0af0ee400 Merge "Address nit from aosp/1301317" am: 14a5bf9510 am: 7b20fde8c9
Change-Id: I7ae9b80954309b18eb6923da3aeaab3d1b8e3231
2020-05-15 07:14:29 +00:00
Treehugger Robot
7b20fde8c9 Merge "Address nit from aosp/1301317" am: 14a5bf9510
Change-Id: I2443c5da4b69bce693a39e894c41db5b25b6cf03
2020-05-15 07:03:31 +00:00
Treehugger Robot
14a5bf9510 Merge "Address nit from aosp/1301317" 2020-05-15 06:43:42 +00:00
Benedict Wong
8b89272659 Merge "Add methods for IKEv2/IPsec test mode profiles" am: 0dfb2b7b68 am: c2bdca3a27 am: b1368b92eb am: d65104d078 am: 623c8c9b7f
Change-Id: Ica5592c8b02effa49a8d672fb30ee703147e025e
2020-05-15 03:50:20 +00:00
Benedict Wong
623c8c9b7f Merge "Add methods for IKEv2/IPsec test mode profiles" am: 0dfb2b7b68 am: c2bdca3a27 am: b1368b92eb am: d65104d078
Change-Id: I73284b878b9622992c2773b4efd9297ae71e07fc
2020-05-15 03:29:53 +00:00
Benedict Wong
d65104d078 Merge "Add methods for IKEv2/IPsec test mode profiles" am: 0dfb2b7b68 am: c2bdca3a27 am: b1368b92eb
Change-Id: I03dd060ae9de05f9491a37f321faacdadab73965
2020-05-15 03:12:05 +00:00
Benedict Wong
b1368b92eb Merge "Add methods for IKEv2/IPsec test mode profiles" am: 0dfb2b7b68 am: c2bdca3a27
Change-Id: I353d999ebcdd108a900abfe20be232e83147b6d2
2020-05-15 02:51:43 +00:00
Benedict Wong
c2bdca3a27 Merge "Add methods for IKEv2/IPsec test mode profiles" am: 0dfb2b7b68
Change-Id: I9ff22188a641fce6b7bd44f7619d1b825988667a
2020-05-15 02:35:39 +00:00
Benedict Wong
0dfb2b7b68 Merge "Add methods for IKEv2/IPsec test mode profiles" 2020-05-15 02:18:02 +00:00
Automerger Merge Worker
ef4baef996 Merge "[automerger skipped] Merge "Use the new NetworkStackConnector constructor" into rvc-dev am: 2404bc617a -s ours am: 8f06ddccbe -s ours" into rvc-d1-dev-plus-aosp am: cf4aa487e6 -s ours am: b95fa45aa2 -s ours
am skip reason: Change-Id I46f247268310e12d420531745a22e93cf3550e89 with SHA-1 cc0836c5e6 is in history

Change-Id: I730e56d5d841a955b339118e84805a73b58d9924
2020-05-14 01:33:48 +00:00
Remi NGUYEN VAN
b2078c744a [automerger skipped] Merge "Use the new NetworkStackConnector constructor" into rvc-dev am: 2404bc617a am: 17237da05e -s ours am: a5ed624c6c -s ours am: d008ddb788 -s ours
am skip reason: Change-Id I46f247268310e12d420531745a22e93cf3550e89 with SHA-1 cc0836c5e6 is in history

Change-Id: I546962ecf4245410ad61b31a4b1c1b074589425c
2020-05-14 01:33:02 +00:00
Remi NGUYEN VAN
a022c657d7 [automerger skipped] Merge "Use the new NetworkStackConnector constructor" into rvc-dev am: 2404bc617a am: 17237da05e am: 52c36113ab -s ours am: cc546400cb -s ours
am skip reason: Change-Id I46f247268310e12d420531745a22e93cf3550e89 with SHA-1 8e2758aa42 is in history

Change-Id: I13bb856d7c7ef5764b868dca2d49abcdd2277fd3
2020-05-14 01:30:42 +00:00
Automerger Merge Worker
b95fa45aa2 Merge "[automerger skipped] Merge "Use the new NetworkStackConnector constructor" into rvc-dev am: 2404bc617a -s ours am: 8f06ddccbe -s ours" into rvc-d1-dev-plus-aosp am: cf4aa487e6 -s ours
am skip reason: Change-Id I46f247268310e12d420531745a22e93cf3550e89 with SHA-1 cc0836c5e6 is in history

Change-Id: I901d2b1c78b526a470bce67b3c935195758bc06d
2020-05-14 00:51:59 +00:00
Remi NGUYEN VAN
d008ddb788 [automerger skipped] Merge "Use the new NetworkStackConnector constructor" into rvc-dev am: 2404bc617a am: 17237da05e -s ours am: a5ed624c6c -s ours
am skip reason: Change-Id I46f247268310e12d420531745a22e93cf3550e89 with SHA-1 cc0836c5e6 is in history

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

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

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

Change-Id: I79c066b158eb693ff3aef5dcae35f6634796aa4f
2020-05-14 00:32:16 +00:00
Remi NGUYEN VAN
17237da05e 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
8f06ddccbe [automerger skipped] Merge "Use the new NetworkStackConnector constructor" into rvc-dev am: 2404bc617a -s ours
am skip reason: Change-Id I46f247268310e12d420531745a22e93cf3550e89 with SHA-1 8e2758aa42 is in history

Change-Id: I6e4c65d2d8fb53a2f39d2c94e020f171f50de2b2
2020-05-14 00:12:01 +00:00
Remi NGUYEN VAN
cc0836c5e6 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
cb09f72f47 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
928e591d99 Merge "[automerger skipped] Merge "Send full LinkProperties to NetworkMonitor" into rvc-dev am: 4c0ddfa692 -s ours am: a8e2c32155 -s ours" into rvc-d1-dev-plus-aosp am: d021dfc531 -s ours am: f31dd5a388 -s ours
am skip reason: Change-Id Ifd4e9c02a6b9a2b2b8b254fc4da7bfb9e0a84550 with SHA-1 1b0c8e3945 is in history

Change-Id: I8b46c9a2f8a885004c49e7bbcffc96b9ce4d5a8b
2020-05-13 01:32:14 +00:00
Automerger Merge Worker
29a6ca9e2c Merge "[automerger skipped] Merge "Send full LinkProperties to NetworkMonitor" into rvc-dev am: 4c0ddfa692 am: 97453866a6 am: be7c169c70 -s ours" into rvc-qpr-dev-plus-aosp am: 91de7b2509 -s ours
am skip reason: Change-Id Ifd4e9c02a6b9a2b2b8b254fc4da7bfb9e0a84550 with SHA-1 1b0c8e3945 is in history

Change-Id: I4ec346e2fb8a28edbf9e2fe73990db0e39bae6b5
2020-05-13 01:28:54 +00:00
Remi NGUYEN VAN
5eb0ecdef4 [automerger skipped] Merge "Send full LinkProperties to NetworkMonitor" into rvc-dev am: 4c0ddfa692 am: 97453866a6 -s ours am: c559d0b71b -s ours am: 42af32210b -s ours
am skip reason: Change-Id Ifd4e9c02a6b9a2b2b8b254fc4da7bfb9e0a84550 with SHA-1 3b1d8b491d is in history

Change-Id: If5949be348bcd5a052e4d0ad23fe1bcf63b246a3
2020-05-13 01:28:15 +00:00
Automerger Merge Worker
f31dd5a388 Merge "[automerger skipped] Merge "Send full LinkProperties to NetworkMonitor" into rvc-dev am: 4c0ddfa692 -s ours am: a8e2c32155 -s ours" into rvc-d1-dev-plus-aosp am: d021dfc531 -s ours
am skip reason: Change-Id Ifd4e9c02a6b9a2b2b8b254fc4da7bfb9e0a84550 with SHA-1 1b0c8e3945 is in history

Change-Id: I881e4b6f0789df7fce7ce4ab1242bfda457a1b38
2020-05-13 01:17:32 +00:00
Automerger Merge Worker
91de7b2509 Merge "[automerger skipped] Merge "Send full LinkProperties to NetworkMonitor" into rvc-dev am: 4c0ddfa692 am: 97453866a6 am: be7c169c70 -s ours" into rvc-qpr-dev-plus-aosp 2020-05-13 01:15:39 +00:00
Remi NGUYEN VAN
a1e83f648b [automerger skipped] Merge "Send full LinkProperties to NetworkMonitor" into rvc-dev am: 4c0ddfa692 am: 97453866a6 am: be7c169c70 -s ours
am skip reason: Change-Id Ifd4e9c02a6b9a2b2b8b254fc4da7bfb9e0a84550 with SHA-1 3b1d8b491d is in history

Change-Id: I18ffb2265247f2cd600e994cb18d9a085c30f764
2020-05-13 01:15:25 +00:00
Remi NGUYEN VAN
42af32210b [automerger skipped] Merge "Send full LinkProperties to NetworkMonitor" into rvc-dev am: 4c0ddfa692 am: 97453866a6 -s ours am: c559d0b71b -s ours
am skip reason: Change-Id Ifd4e9c02a6b9a2b2b8b254fc4da7bfb9e0a84550 with SHA-1 3b1d8b491d is in history

Change-Id: Id509afa23991606511134bb7d10f8cd2152add0d
2020-05-13 01:15:18 +00:00
Remi NGUYEN VAN
5c079bddd1 [automerger skipped] Merge "Send full LinkProperties to NetworkMonitor" into rvc-dev am: 4c0ddfa692 -s ours am: a8e2c32155 -s ours
am skip reason: Change-Id Ifd4e9c02a6b9a2b2b8b254fc4da7bfb9e0a84550 with SHA-1 1b0c8e3945 is in history

Change-Id: I9b7431c4fd6dd21511222a3e71c07eb17265f1cf
2020-05-13 01:02:21 +00:00
Remi NGUYEN VAN
c559d0b71b [automerger skipped] Merge "Send full LinkProperties to NetworkMonitor" into rvc-dev am: 4c0ddfa692 am: 97453866a6 -s ours
am skip reason: Change-Id Ifd4e9c02a6b9a2b2b8b254fc4da7bfb9e0a84550 with SHA-1 3b1d8b491d is in history

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

Change-Id: Ic5d0d8461cbaf0a75da92b47d2d0aaa7a7743fb6
2020-05-13 00:48:39 +00:00
Remi NGUYEN VAN
97453866a6 Merge "Send full LinkProperties to NetworkMonitor" into rvc-dev am: 4c0ddfa692
Change-Id: I2ec432881b77f0b093fc4ced18fe775a91ae93d3
2020-05-13 00:48:30 +00:00
Remi NGUYEN VAN
4c0ddfa692 Merge "Send full LinkProperties to NetworkMonitor" into rvc-dev 2020-05-13 00:34:41 +00:00
Automerger Merge Worker
1e651c683a Merge "[automerger skipped] Merge changes I37dd459d,I1959f308 into rvc-dev am: 0cd6d1cb70 -s ours am: d4cd49c306 -s ours" into rvc-d1-dev-plus-aosp am: 0d34274a6b -s ours am: 8a89c6f942 -s ours
am skip reason: Change-Id I37dd459d08b57b14f72f3b28ea80fa231b152f10 with SHA-1 ad72d21a53 is in history

Change-Id: I64a603abfab86adf99ee30417e1b11566f1b563a
2020-05-12 22:36:51 +00:00
Automerger Merge Worker
7c15974482 [automerger skipped] Merge changes from topic "am-a4c996e50cb34a3bb257f059536b77ae" into rvc-d1-dev-plus-aosp am: 5f93a08607 -s ours am: 09d264f306 -s ours
am skip reason: Change-Id I37dd459d08b57b14f72f3b28ea80fa231b152f10 with SHA-1 d06d390b20 is in history

Change-Id: Id6a067912a46cbed8201da3a9057d183017740d3
2020-05-12 22:32:41 +00:00
Automerger Merge Worker
8a89c6f942 Merge "[automerger skipped] Merge changes I37dd459d,I1959f308 into rvc-dev am: 0cd6d1cb70 -s ours am: d4cd49c306 -s ours" into rvc-d1-dev-plus-aosp am: 0d34274a6b -s ours
am skip reason: Change-Id I37dd459d08b57b14f72f3b28ea80fa231b152f10 with SHA-1 ad72d21a53 is in history

Change-Id: Ie3884e88a5e1b7e8997da346c7984a6bf02b186f
2020-05-12 21:04:43 +00:00
Automerger Merge Worker
09d264f306 [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 d06d390b20 is in history

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

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

Change-Id: Ib9aaf9091937ae27f35a389cc3de696567cefe1b
2020-05-12 20:46:55 +00:00
Benedict Wong
c9900c03c2 [automerger skipped] Use TransformRecord to get SPI instead of SpiRecord am: c6cdcbfa83 am: a4d2cac578 -s ours
am skip reason: Change-Id I1959f3080946267243564459ff4207647922566e with SHA-1 1425cf5655 is in history

Change-Id: Id31a417c7a4204bd646400e90456424d12d2d9d0
2020-05-12 20:46:52 +00:00
TreeHugger Robot
e9c51564aa Merge changes I37dd459d,I1959f308 into rvc-dev am: 0cd6d1cb70
Change-Id: Ie0c5a3c7bfc16edf98203212b8a1e7e4e8b302b9
2020-05-12 20:45:01 +00:00
Benedict Wong
a4d2cac578 Use TransformRecord to get SPI instead of SpiRecord am: c6cdcbfa83
Change-Id: I011543293623240b5652ac9818b0b3f28a397e97
2020-05-12 20:44:59 +00:00
TreeHugger Robot
d4cd49c306 [automerger skipped] Merge changes I37dd459d,I1959f308 into rvc-dev am: 0cd6d1cb70 -s ours
am skip reason: Change-Id I37dd459d08b57b14f72f3b28ea80fa231b152f10 with SHA-1 d06d390b20 is in history

Change-Id: I0b5556bcaa27ca0a379f910bfba80aec506348c9
2020-05-12 20:41:03 +00:00
Automerger Merge Worker
32bc4185a4 Merge "Merge "Create TestApi for simulating a Data Stall on ConnectivityService." am: 727f0d1d44 am: 1d81e3c69e" into rvc-dev-plus-aosp am: abd8340a70 am: a1424e18bc am: 29638bc032
Change-Id: I287a77da7cfc176a4f159318d8847ba65c093da4
2020-05-12 18:48:04 +00:00
Cody Kesting
5e6cc3187b Merge "Set owner and administrator UIDs for test networks." am: eb44b7b1bb am: e4e48c22c5 am: 51edeeeb65 am: 88d1b83af6 am: e0336ca4d6
Change-Id: I4925d5a7f9c4dd063e87b138806a7b562a7390e4
2020-05-12 18:47:10 +00:00