Commit Graph

10801 Commits

Author SHA1 Message Date
Benedict Wong
02cfd0d4fd Merge "Add RequiresFeature annotations for IKEv2 VPN profiles" am: 618912a51c am: 6f54a418dc am: 7300c9e7be am: a69fc51da6 am: c76e5a88f5
Change-Id: Iedbc72cf6c5d57e2f108d49c6d1e773cca300463
2020-05-29 22:55:33 +00:00
Benedict Wong
c76e5a88f5 Merge "Add RequiresFeature annotations for IKEv2 VPN profiles" am: 618912a51c am: 6f54a418dc am: 7300c9e7be am: a69fc51da6
Change-Id: Iec249ec6520b817524dd3d7cf49457934fab80c8
2020-05-29 22:38:58 +00:00
Benedict Wong
a69fc51da6 Merge "Add RequiresFeature annotations for IKEv2 VPN profiles" am: 618912a51c am: 6f54a418dc am: 7300c9e7be
Change-Id: I8b4b8810c2cb32f9cc7b4899491f98176de92e76
2020-05-29 22:25:22 +00:00
Benedict Wong
7300c9e7be Merge "Add RequiresFeature annotations for IKEv2 VPN profiles" am: 618912a51c am: 6f54a418dc
Change-Id: I30379974f8396abbb30877f88356c38bea002968
2020-05-29 22:05:59 +00:00
Benedict Wong
6f54a418dc Merge "Add RequiresFeature annotations for IKEv2 VPN profiles" am: 618912a51c
Change-Id: I4a135e75105a49b25b65ba76a3c252467bd9d5ea
2020-05-29 21:41:40 +00:00
Benedict Wong
36c74cb2ab [automerger skipped] Merge "Add RequiresFeature annotations for IKEv2 VPN profiles" into rvc-dev am: 2a0b964e76 am: 7b05b0f5e6 -s ours am: 47be608fa5 -s ours am: e0403b6aec -s ours
am skip reason: Change-Id I125d8fbe5d67fb877ad7d0636c007cb3e1a9f59b with SHA-1 7c40fcb2a4 is in history

Change-Id: I402502781c55c6822d53d2c91c5e68ae910b4e42
2020-05-29 18:24:10 +00:00
Benedict Wong
0c28670222 Merge "Add RequiresFeature annotations for IKEv2 VPN profiles" into rvc-dev am: 2a0b964e76 am: 0bdb3d9c51 am: 9e34b7f288 am: cc8c22564b
Change-Id: I3f95200a5bdcec9b6e0f6b6e0dddfa218240cd48
2020-05-29 18:23:15 +00:00
Benedict Wong
e0403b6aec [automerger skipped] Merge "Add RequiresFeature annotations for IKEv2 VPN profiles" into rvc-dev am: 2a0b964e76 am: 7b05b0f5e6 -s ours am: 47be608fa5 -s ours
am skip reason: Change-Id I125d8fbe5d67fb877ad7d0636c007cb3e1a9f59b with SHA-1 7c40fcb2a4 is in history

Change-Id: Ice68d966cf49980d2fc2a4b2fd674e6812bf8aa4
2020-05-29 18:06:12 +00:00
Benedict Wong
cc8c22564b Merge "Add RequiresFeature annotations for IKEv2 VPN profiles" into rvc-dev am: 2a0b964e76 am: 0bdb3d9c51 am: 9e34b7f288
Change-Id: I1198643916b9b5d4641145424aa53692a36ef354
2020-05-29 18:05:41 +00:00
Benedict Wong
47be608fa5 [automerger skipped] Merge "Add RequiresFeature annotations for IKEv2 VPN profiles" into rvc-dev am: 2a0b964e76 am: 7b05b0f5e6 -s ours
am skip reason: Change-Id I125d8fbe5d67fb877ad7d0636c007cb3e1a9f59b with SHA-1 7c40fcb2a4 is in history

Change-Id: I15aa826d5d64a85af40a24278da070aeae5c422c
2020-05-29 17:46:02 +00:00
Benedict Wong
9e34b7f288 Merge "Add RequiresFeature annotations for IKEv2 VPN profiles" into rvc-dev am: 2a0b964e76 am: 0bdb3d9c51
Change-Id: Id03dc7e3e2912f308b4ed42f2cc8cae80d9cd95d
2020-05-29 17:45:55 +00:00
Cody Kesting
4c7cc9a512 [automerger skipped] Merge "Comment reason for simulateDataStall structure." into rvc-dev am: 99e673b056 -s ours am: 6d8528c1ee -s ours am: cc35a46c45 -s ours am: 7b4580ae9c -s ours
am skip reason: Change-Id I751054418bf328c72b977a1cc99c27cb9b8ab7ba with SHA-1 a52847cfeb is in history

Change-Id: Ie38edcc22998811ba54da3f9a5e8ac56e3bdcc8b
2020-05-29 17:40:03 +00:00
Automerger Merge Worker
6d9e21d6f2 Merge "[automerger skipped] Merge "Comment reason for simulateDataStall structure." into rvc-dev am: 99e673b056 am: 3d65ccb9f8 -s ours am: 63ed7b1547 -s ours" into rvc-qpr-dev-plus-aosp am: 87fafc0647 -s ours
am skip reason: Change-Id I751054418bf328c72b977a1cc99c27cb9b8ab7ba with SHA-1 a52847cfeb is in history

Change-Id: I97e9fb7c718eb9752cf3470acb33f44286bdcd7b
2020-05-29 17:39:29 +00:00
Cody Kesting
3506398f75 [automerger skipped] Merge "Comment reason for simulateDataStall structure." into rvc-dev am: 99e673b056 am: 3d65ccb9f8 am: 023ea246fe -s ours am: 7fe36d5f46 -s ours
am skip reason: Change-Id I751054418bf328c72b977a1cc99c27cb9b8ab7ba with SHA-1 51691051d2 is in history

Change-Id: Ide617caeeb9d8b30988b22791d8ccc561ed16b32
2020-05-29 17:39:00 +00:00
Benedict Wong
0bdb3d9c51 Merge "Add RequiresFeature annotations for IKEv2 VPN profiles" into rvc-dev am: 2a0b964e76
Change-Id: If586cc601523aced520da3ebba00bca60d34a794
2020-05-29 17:32:44 +00:00
Benedict Wong
7b05b0f5e6 Merge "Add RequiresFeature annotations for IKEv2 VPN profiles" into rvc-dev am: 2a0b964e76
Change-Id: Ibc0f236234cd87d50a393c3dfaca7898b04e7432
2020-05-29 17:32:42 +00:00
Cody Kesting
7b4580ae9c [automerger skipped] Merge "Comment reason for simulateDataStall structure." into rvc-dev am: 99e673b056 -s ours am: 6d8528c1ee -s ours am: cc35a46c45 -s ours
am skip reason: Change-Id I751054418bf328c72b977a1cc99c27cb9b8ab7ba with SHA-1 a52847cfeb is in history

Change-Id: Ic8ffec6c6692e38105c44c3db4f1c1d0296abb8a
2020-05-29 17:22:39 +00:00
Automerger Merge Worker
87fafc0647 Merge "[automerger skipped] Merge "Comment reason for simulateDataStall structure." into rvc-dev am: 99e673b056 am: 3d65ccb9f8 -s ours am: 63ed7b1547 -s ours" into rvc-qpr-dev-plus-aosp 2020-05-29 17:21:26 +00:00
Cody Kesting
1eb4ffa8f3 [automerger skipped] Merge "Comment reason for simulateDataStall structure." into rvc-dev am: 99e673b056 am: 3d65ccb9f8 -s ours am: 63ed7b1547 -s ours
am skip reason: Change-Id I751054418bf328c72b977a1cc99c27cb9b8ab7ba with SHA-1 51691051d2 is in history

Change-Id: Ib739972892f4a998246c8070bf92727698d3f7f2
2020-05-29 17:21:17 +00:00
Cody Kesting
7fe36d5f46 [automerger skipped] Merge "Comment reason for simulateDataStall structure." into rvc-dev am: 99e673b056 am: 3d65ccb9f8 am: 023ea246fe -s ours
am skip reason: Change-Id I751054418bf328c72b977a1cc99c27cb9b8ab7ba with SHA-1 51691051d2 is in history

Change-Id: Ie3cd9207688be27d35fc7ffba152f907118b6fd0
2020-05-29 17:21:08 +00:00
Benedict Wong
2a0b964e76 Merge "Add RequiresFeature annotations for IKEv2 VPN profiles" into rvc-dev 2020-05-29 17:17:10 +00:00
Cody Kesting
cc35a46c45 [automerger skipped] Merge "Comment reason for simulateDataStall structure." into rvc-dev am: 99e673b056 -s ours am: 6d8528c1ee -s ours
am skip reason: Change-Id I751054418bf328c72b977a1cc99c27cb9b8ab7ba with SHA-1 51691051d2 is in history

Change-Id: I0c2984504e0330745d188f2c390aa8b80af53168
2020-05-29 16:58:39 +00:00
Cody Kesting
63ed7b1547 [automerger skipped] Merge "Comment reason for simulateDataStall structure." into rvc-dev am: 99e673b056 am: 3d65ccb9f8 -s ours
am skip reason: Change-Id I751054418bf328c72b977a1cc99c27cb9b8ab7ba with SHA-1 51691051d2 is in history

Change-Id: Ia7169e63e257785e4cd12bf65f01d9f0bc3c7037
2020-05-29 16:58:26 +00:00
Cody Kesting
3d65ccb9f8 Merge "Comment reason for simulateDataStall structure." into rvc-dev am: 99e673b056
Change-Id: I6b27cbb174090936f8dfcbe0d82dcdbe387683ee
2020-05-29 16:40:40 +00:00
Cody Kesting
6d8528c1ee [automerger skipped] Merge "Comment reason for simulateDataStall structure." into rvc-dev am: 99e673b056 -s ours
am skip reason: Change-Id I751054418bf328c72b977a1cc99c27cb9b8ab7ba with SHA-1 51691051d2 is in history

Change-Id: I38c6caaa9805bc6e0adb553223a26b6561d62ab6
2020-05-29 16:40:31 +00:00
Cody Kesting
99e673b056 Merge "Comment reason for simulateDataStall structure." into rvc-dev 2020-05-29 16:29:23 +00:00
TreeHugger Robot
f591e85f50 Merge "Add dnsproxyd_protocol_headers for NETID_USE_LOCAL_NAMESERVERS" into rvc-dev am: 3abae6da06 am: 49fb003b51 am: 370bd94085 am: c2e5b6ed2e
Change-Id: Ib0aea797c5342e21819f895631dd2c29ed740e09
2020-05-29 14:50:13 +00:00
TreeHugger Robot
bf5afa78b5 Merge "Add dnsproxyd_protocol_headers for NETID_USE_LOCAL_NAMESERVERS" into rvc-dev am: 3abae6da06 am: c029e74145 am: b64de67a32 am: 39924665f9
Change-Id: I5ad15218e901634c7f6c84abb528eea12daa5e82
2020-05-29 14:49:18 +00:00
TreeHugger Robot
c2e5b6ed2e Merge "Add dnsproxyd_protocol_headers for NETID_USE_LOCAL_NAMESERVERS" into rvc-dev am: 3abae6da06 am: 49fb003b51 am: 370bd94085
Change-Id: I035219d077e990016c6f3cafa07f0f9ec750ea6e
2020-05-29 14:33:07 +00:00
TreeHugger Robot
39924665f9 Merge "Add dnsproxyd_protocol_headers for NETID_USE_LOCAL_NAMESERVERS" into rvc-dev am: 3abae6da06 am: c029e74145 am: b64de67a32
Change-Id: Idb124d0386088fbdc2732337a8c6f5c53ecaa6b8
2020-05-29 14:32:21 +00:00
TreeHugger Robot
370bd94085 Merge "Add dnsproxyd_protocol_headers for NETID_USE_LOCAL_NAMESERVERS" into rvc-dev am: 3abae6da06 am: 49fb003b51
Change-Id: I5da0a7fea11a6e78f862e95ae0f246bbadad77dc
2020-05-29 14:20:22 +00:00
TreeHugger Robot
b64de67a32 Merge "Add dnsproxyd_protocol_headers for NETID_USE_LOCAL_NAMESERVERS" into rvc-dev am: 3abae6da06 am: c029e74145
Change-Id: If7e0be35ad58b0d4c6a5436a4d6bdd2c7c490ef6
2020-05-29 14:19:49 +00:00
TreeHugger Robot
c029e74145 Merge "Add dnsproxyd_protocol_headers for NETID_USE_LOCAL_NAMESERVERS" into rvc-dev am: 3abae6da06
Change-Id: I3ab5b7ad875abbe7fe6edcb834bf7d0cb06e5116
2020-05-29 14:09:23 +00:00
TreeHugger Robot
49fb003b51 Merge "Add dnsproxyd_protocol_headers for NETID_USE_LOCAL_NAMESERVERS" into rvc-dev am: 3abae6da06
Change-Id: Ib788169bef168bde7bd49de3dfee6b4e3fcb2561
2020-05-29 14:09:22 +00:00
TreeHugger Robot
3abae6da06 Merge "Add dnsproxyd_protocol_headers for NETID_USE_LOCAL_NAMESERVERS" into rvc-dev 2020-05-29 14:01:18 +00:00
Chalard Jean
a1667f254a [automerger skipped] Merge "Adjust tests for renaming groupHint to cluster." into rvc-dev am: 6489161fd5 am: 9afd861e3d -s ours am: 3c78a0aa71 -s ours am: 5dad2c145c -s ours
am skip reason: Change-Id I69f7a2971cc5985d0f0078aecc39d4d6a6130033 with SHA-1 552c570501 is in history

Change-Id: Ibab7c4df05c5296fe722f24fae1bdbe1ea42e44e
2020-05-29 04:57:35 +00:00
Chalard Jean
080b5c6b58 [automerger skipped] Merge "Adjust tests for renaming groupHint to cluster." into rvc-dev am: 6489161fd5 -s ours am: af9fb365c6 -s ours am: 24d8758ea3 -s ours am: 3541d26a05 -s ours
am skip reason: Change-Id I69f7a2971cc5985d0f0078aecc39d4d6a6130033 with SHA-1 552c570501 is in history

Change-Id: I2a9adab48d6a648df47acc5ea3938d7337d205bf
2020-05-29 04:57:20 +00:00
Chalard Jean
ffe4767d64 [automerger skipped] Merge "Adjust tests for renaming groupHint to cluster." into rvc-dev am: 6489161fd5 am: 9afd861e3d am: 85972ff323 -s ours am: ba699d6f29 -s ours
am skip reason: Change-Id I69f7a2971cc5985d0f0078aecc39d4d6a6130033 with SHA-1 552c570501 is in history

Change-Id: Ia1f5889c66c2002ec31762f7b59f8e652939fbac
2020-05-29 04:56:19 +00:00
Chalard Jean
5dad2c145c [automerger skipped] Merge "Adjust tests for renaming groupHint to cluster." into rvc-dev am: 6489161fd5 am: 9afd861e3d -s ours am: 3c78a0aa71 -s ours
am skip reason: Change-Id I69f7a2971cc5985d0f0078aecc39d4d6a6130033 with SHA-1 552c570501 is in history

Change-Id: I697f4964b78384a8ae7a0b2c7d9e4065e8b7a784
2020-05-29 04:37:18 +00:00
Chalard Jean
3541d26a05 [automerger skipped] Merge "Adjust tests for renaming groupHint to cluster." into rvc-dev am: 6489161fd5 -s ours am: af9fb365c6 -s ours am: 24d8758ea3 -s ours
am skip reason: Change-Id I69f7a2971cc5985d0f0078aecc39d4d6a6130033 with SHA-1 552c570501 is in history

Change-Id: I44b2b1418edd44254b55d4a3555e4c469bf18b18
2020-05-29 04:36:30 +00:00
Chalard Jean
ba699d6f29 [automerger skipped] Merge "Adjust tests for renaming groupHint to cluster." into rvc-dev am: 6489161fd5 am: 9afd861e3d am: 85972ff323 -s ours
am skip reason: Change-Id I69f7a2971cc5985d0f0078aecc39d4d6a6130033 with SHA-1 552c570501 is in history

Change-Id: I469e7291382a618d6ed28af81809666bee0ea036
2020-05-29 04:34:54 +00:00
Chalard Jean
3c78a0aa71 [automerger skipped] Merge "Adjust tests for renaming groupHint to cluster." into rvc-dev am: 6489161fd5 am: 9afd861e3d -s ours
am skip reason: Change-Id I69f7a2971cc5985d0f0078aecc39d4d6a6130033 with SHA-1 552c570501 is in history

Change-Id: I02083210e01e54bc16941748ac18073c4679e0ad
2020-05-29 04:29:01 +00:00
Chalard Jean
24d8758ea3 [automerger skipped] Merge "Adjust tests for renaming groupHint to cluster." into rvc-dev am: 6489161fd5 -s ours am: af9fb365c6 -s ours
am skip reason: Change-Id I69f7a2971cc5985d0f0078aecc39d4d6a6130033 with SHA-1 552c570501 is in history

Change-Id: I73b54353fea73f05da299c7396e40350c623a103
2020-05-29 04:22:23 +00:00
Chalard Jean
9afd861e3d Merge "Adjust tests for renaming groupHint to cluster." into rvc-dev am: 6489161fd5
Change-Id: I91768e43fb69c74058b248a03698d6ffedf94f55
2020-05-29 04:21:59 +00:00
Chalard Jean
af9fb365c6 [automerger skipped] Merge "Adjust tests for renaming groupHint to cluster." into rvc-dev am: 6489161fd5 -s ours
am skip reason: Change-Id I69f7a2971cc5985d0f0078aecc39d4d6a6130033 with SHA-1 552c570501 is in history

Change-Id: Ic26210767bf8f4026c7074c048e77300e29d7a24
2020-05-29 04:21:16 +00:00
Automerger Merge Worker
0b03324129 Adjust tests for renaming groupHint to cluster.
Bug: 146460486
Test: atest android.net.IpMemoryStoreTest
Test: atest com.android.server.connectivity.ipmemorystore.IpMemoryStoreServiceTest
Change-Id: Ia9797bb93aa4ff89147a77823d342dc22aec6a25
Merged-In: I69f7a2971cc5985d0f0078aecc39d4d6a6130033
(cherry-picked from aosp/1311654)
2020-05-29 02:28:59 +00:00
Benedict Wong
7c40fcb2a4 Add RequiresFeature annotations for IKEv2 VPN profiles
This change adds the @RequiresFeature annotation to Ikev2VpnProfile
Builder methods, and checks before provisioning VPN profiles.

Bug: 156681625
Test: New tests added, passing.
Change-Id: I125d8fbe5d67fb877ad7d0636c007cb3e1a9f59b
Merged-In: I125d8fbe5d67fb877ad7d0636c007cb3e1a9f59b
(cherry picked from commit e84a17dd1706f4c8373047b2023a1ec4b7cf4bf3)
2020-05-28 19:07:29 -07:00
Benedict Wong
618912a51c Merge "Add RequiresFeature annotations for IKEv2 VPN profiles" 2020-05-29 01:55:08 +00:00
Automerger Merge Worker
0a0429413f [automerger skipped] Merge changes from topic "am-d4e6f5f13e6444d789241ddf4f3d44fc" into rvc-qpr-dev-plus-aosp am: 4198173825 -s ours
am skip reason: Change-Id I289d935f84b616ed857ef4c5a7427d57c282d00c with SHA-1 bde194b816 is in history

Change-Id: I50d233448d37218c463c789250f8681cf2986136
2020-05-28 22:13:26 +00:00
TreeHugger Robot
328475f2e3 [automerger skipped] Merge changes I289d935f,I0121a4ac,Ie73ba058,I4393afcb,Ifebd946e, ... into rvc-dev am: c119ee1ed2 am: d157591df7 -s ours am: 5519f9c669 -s ours
am skip reason: Change-Id I289d935f84b616ed857ef4c5a7427d57c282d00c with SHA-1 bde194b816 is in history

Change-Id: I40af096b41db07aa93267e83486e2a0a2aafc04e
2020-05-28 21:48:59 +00:00