LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,509 Commits 2 Branches 0 Tags
ff1c289d6ce38a5fd76bf5ba1fda99a55a2fe2c8
Commit Graph

11509 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Benedict Wong
1c0852da13 Merge "Add RequiresFeature annotations for IKEv2 VPN profiles" am: de684cfa06 am: 29879886c9 am: 4b104c3dad 
Change-Id: I8b4b8810c2cb32f9cc7b4899491f98176de92e76
 2020-05-29 22:25:22 +00:00
Remi NGUYEN VAN
b9bd905c0b Merge "Allow TRANSPORT_TEST ethernet networks" am: 6642ec61c3 am: 54c3c2b3c7 
Change-Id: I030f0aeb0f196fee213fee02a25c5a7e66618b93
 2020-05-29 22:09:13 +00:00
Benedict Wong
4b104c3dad Merge "Add RequiresFeature annotations for IKEv2 VPN profiles" am: de684cfa06 am: 29879886c9 
Change-Id: I30379974f8396abbb30877f88356c38bea002968
 2020-05-29 22:05:59 +00:00
Remi NGUYEN VAN
54c3c2b3c7 Merge "Allow TRANSPORT_TEST ethernet networks" am: 6642ec61c3 
Change-Id: Ib9ab1ddb855c90219e94c4b74dc7268cfbcdb661
 2020-05-29 21:43:41 +00:00
Benedict Wong
29879886c9 Merge "Add RequiresFeature annotations for IKEv2 VPN profiles" am: de684cfa06 
Change-Id: I4a135e75105a49b25b65ba76a3c252467bd9d5ea
 2020-05-29 21:41:40 +00:00
Benedict Wong
703252326e [automerger skipped] Merge "Add RequiresFeature annotations for IKEv2 VPN profiles" into rvc-dev am: 36d9c275ac am: f4a72ac0ff -s ours am: d4e9e1a6fe -s ours 
am skip reason: Change-Id I125d8fbe5d67fb877ad7d0636c007cb3e1a9f59b with SHA-1 ba8ca78394 is in history

Change-Id: Ice68d966cf49980d2fc2a4b2fd674e6812bf8aa4
 2020-05-29 18:06:12 +00:00
Benedict Wong
723f11fb68 Merge "Add RequiresFeature annotations for IKEv2 VPN profiles" into rvc-dev am: 36d9c275ac am: 1d63ae83d2 am: 5dab1e1011 
Change-Id: I1198643916b9b5d4641145424aa53692a36ef354
 2020-05-29 18:05:41 +00:00
Benedict Wong
d4e9e1a6fe [automerger skipped] Merge "Add RequiresFeature annotations for IKEv2 VPN profiles" into rvc-dev am: 36d9c275ac am: f4a72ac0ff -s ours 
am skip reason: Change-Id I125d8fbe5d67fb877ad7d0636c007cb3e1a9f59b with SHA-1 ba8ca78394 is in history

Change-Id: I15aa826d5d64a85af40a24278da070aeae5c422c
 2020-05-29 17:46:02 +00:00
Benedict Wong
5dab1e1011 Merge "Add RequiresFeature annotations for IKEv2 VPN profiles" into rvc-dev am: 36d9c275ac am: 1d63ae83d2 
Change-Id: Id03dc7e3e2912f308b4ed42f2cc8cae80d9cd95d
 2020-05-29 17:45:55 +00:00
Benedict Wong
1d63ae83d2 Merge "Add RequiresFeature annotations for IKEv2 VPN profiles" into rvc-dev am: 36d9c275ac 
Change-Id: If586cc601523aced520da3ebba00bca60d34a794
 2020-05-29 17:32:44 +00:00
Benedict Wong
f4a72ac0ff Merge "Add RequiresFeature annotations for IKEv2 VPN profiles" into rvc-dev am: 36d9c275ac 
Change-Id: Ibc0f236234cd87d50a393c3dfaca7898b04e7432
 2020-05-29 17:32:42 +00:00
Cody Kesting
df8a6ab7c0 [automerger skipped] Merge "Comment reason for simulateDataStall structure." into rvc-dev am: 84ad118843 -s ours am: 45bc099adc -s ours am: bcd6b7762c -s ours 
am skip reason: Change-Id I751054418bf328c72b977a1cc99c27cb9b8ab7ba with SHA-1 2796382103 is in history

Change-Id: Ic8ffec6c6692e38105c44c3db4f1c1d0296abb8a
 2020-05-29 17:22:39 +00:00
Automerger Merge Worker
2a026a338c Merge "[automerger skipped] Merge "Comment reason for simulateDataStall structure." into rvc-dev am: 84ad118843 am: 909e6477bd -s ours am: 8e9ff3d33e -s ours" into rvc-qpr-dev-plus-aosp 2020-05-29 17:21:26 +00:00
Cody Kesting
a1ee2fe3c0 [automerger skipped] Merge "Comment reason for simulateDataStall structure." into rvc-dev am: 84ad118843 am: 909e6477bd -s ours am: 8e9ff3d33e -s ours 
am skip reason: Change-Id I751054418bf328c72b977a1cc99c27cb9b8ab7ba with SHA-1 652e3ec4f1 is in history

Change-Id: Ib739972892f4a998246c8070bf92727698d3f7f2
 2020-05-29 17:21:17 +00:00
Cody Kesting
8fd21394f6 [automerger skipped] Merge "Comment reason for simulateDataStall structure." into rvc-dev am: 84ad118843 am: 909e6477bd am: 023ea246fe -s ours 
am skip reason: Change-Id I751054418bf328c72b977a1cc99c27cb9b8ab7ba with SHA-1 652e3ec4f1 is in history

Change-Id: Ie3cd9207688be27d35fc7ffba152f907118b6fd0
 2020-05-29 17:21:08 +00:00
Benedict Wong
36d9c275ac Merge "Add RequiresFeature annotations for IKEv2 VPN profiles" into rvc-dev 2020-05-29 17:17:10 +00:00
Cody Kesting
bcd6b7762c [automerger skipped] Merge "Comment reason for simulateDataStall structure." into rvc-dev am: 84ad118843 -s ours am: 45bc099adc -s ours 
am skip reason: Change-Id I751054418bf328c72b977a1cc99c27cb9b8ab7ba with SHA-1 652e3ec4f1 is in history

Change-Id: I0c2984504e0330745d188f2c390aa8b80af53168
 2020-05-29 16:58:39 +00:00
Cody Kesting
8e9ff3d33e [automerger skipped] Merge "Comment reason for simulateDataStall structure." into rvc-dev am: 84ad118843 am: 909e6477bd -s ours 
am skip reason: Change-Id I751054418bf328c72b977a1cc99c27cb9b8ab7ba with SHA-1 652e3ec4f1 is in history

Change-Id: Ia7169e63e257785e4cd12bf65f01d9f0bc3c7037
 2020-05-29 16:58:26 +00:00
Cody Kesting
909e6477bd Merge "Comment reason for simulateDataStall structure." into rvc-dev am: 84ad118843 
Change-Id: I6b27cbb174090936f8dfcbe0d82dcdbe387683ee
 2020-05-29 16:40:40 +00:00
Cody Kesting
45bc099adc [automerger skipped] Merge "Comment reason for simulateDataStall structure." into rvc-dev am: 84ad118843 -s ours 
am skip reason: Change-Id I751054418bf328c72b977a1cc99c27cb9b8ab7ba with SHA-1 652e3ec4f1 is in history

Change-Id: I38c6caaa9805bc6e0adb553223a26b6561d62ab6
 2020-05-29 16:40:31 +00:00
Cody Kesting
84ad118843 Merge "Comment reason for simulateDataStall structure." into rvc-dev 2020-05-29 16:29:23 +00:00
TreeHugger Robot
b07f7aa332 Merge "Add dnsproxyd_protocol_headers for NETID_USE_LOCAL_NAMESERVERS" into rvc-dev am: 51de3f8a10 am: debec6087b am: 18378bce04 
Change-Id: I035219d077e990016c6f3cafa07f0f9ec750ea6e
 2020-05-29 14:33:07 +00:00
TreeHugger Robot
0d010594e6 Merge "Add dnsproxyd_protocol_headers for NETID_USE_LOCAL_NAMESERVERS" into rvc-dev am: 51de3f8a10 am: 76f82ab58f am: 226ff5032d 
Change-Id: Idb124d0386088fbdc2732337a8c6f5c53ecaa6b8
 2020-05-29 14:32:21 +00:00
TreeHugger Robot
18378bce04 Merge "Add dnsproxyd_protocol_headers for NETID_USE_LOCAL_NAMESERVERS" into rvc-dev am: 51de3f8a10 am: debec6087b 
Change-Id: I5da0a7fea11a6e78f862e95ae0f246bbadad77dc
 2020-05-29 14:20:22 +00:00
TreeHugger Robot
226ff5032d Merge "Add dnsproxyd_protocol_headers for NETID_USE_LOCAL_NAMESERVERS" into rvc-dev am: 51de3f8a10 am: 76f82ab58f 
Change-Id: If7e0be35ad58b0d4c6a5436a4d6bdd2c7c490ef6
 2020-05-29 14:19:49 +00:00
TreeHugger Robot
76f82ab58f Merge "Add dnsproxyd_protocol_headers for NETID_USE_LOCAL_NAMESERVERS" into rvc-dev am: 51de3f8a10 
Change-Id: I3ab5b7ad875abbe7fe6edcb834bf7d0cb06e5116
 2020-05-29 14:09:23 +00:00
TreeHugger Robot
debec6087b Merge "Add dnsproxyd_protocol_headers for NETID_USE_LOCAL_NAMESERVERS" into rvc-dev am: 51de3f8a10 
Change-Id: Ib788169bef168bde7bd49de3dfee6b4e3fcb2561
 2020-05-29 14:09:22 +00:00
TreeHugger Robot
51de3f8a10 Merge "Add dnsproxyd_protocol_headers for NETID_USE_LOCAL_NAMESERVERS" into rvc-dev 2020-05-29 14:01:18 +00:00
android-build-team Robot
989b38331b Snap for 6539570 from b04b04a849eac3c27464bc76d16909fad37bedf5 to mainline-release 
Change-Id: I03a57a5f17ac6753aba6153ceb0548dd31d017c7
 2020-05-29 07:02:51 +00:00
Remi NGUYEN VAN
6642ec61c3 Merge "Allow TRANSPORT_TEST ethernet networks" 2020-05-29 06:26:14 +00:00
Chalard Jean
5a6ff8c501 [automerger skipped] Merge "Adjust tests for renaming groupHint to cluster." into rvc-dev am: 6489161fd5 am: 42e012ca7d -s ours am: de50a1c929 -s ours 
am skip reason: Change-Id I69f7a2971cc5985d0f0078aecc39d4d6a6130033 with SHA-1 3cd880b4bb is in history

Change-Id: I697f4964b78384a8ae7a0b2c7d9e4065e8b7a784
 2020-05-29 04:37:18 +00:00
Chalard Jean
5e549e4e5e [automerger skipped] Merge "Adjust tests for renaming groupHint to cluster." into rvc-dev am: 6489161fd5 -s ours am: 1706cf3898 -s ours am: 0da88fc465 -s ours 
am skip reason: Change-Id I69f7a2971cc5985d0f0078aecc39d4d6a6130033 with SHA-1 3cd880b4bb is in history

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

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

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

Change-Id: I73b54353fea73f05da299c7396e40350c623a103
 2020-05-29 04:22:23 +00:00
Chalard Jean
42e012ca7d 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
1706cf3898 [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 3cd880b4bb is in history

Change-Id: Ic26210767bf8f4026c7074c048e77300e29d7a24
 2020-05-29 04:21:16 +00:00
Automerger Merge Worker
dcb0e912b1 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
ba8ca78394 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
de684cfa06 Merge "Add RequiresFeature annotations for IKEv2 VPN profiles" 2020-05-29 01:55:08 +00:00
Remi NGUYEN VAN
656c566cf1 Allow TRANSPORT_TEST ethernet networks 
Ethernet networks using tap interfaces should have TRANSPORT_TEST so
they are not considered by network selection.

Test: atest CaptivePortalApiTest FrameworksNetTests
Bug: 156319532
Change-Id: I0d9477977c88aa055625ab4046577a41e76b05ff
 2020-05-29 10:22:50 +09:00
android-build-team Robot
bbe5adc5da Snap for 6538416 from 4911db037b82a92a30c0bed2ce01b7516c4f414a to rvc-release 
Change-Id: I4f4c4465f8c042839083209d51b523e41d30f896
 2020-05-29 01:02:11 +00:00
TreeHugger Robot
b11059e23e [automerger skipped] Merge changes I289d935f,I0121a4ac,Ie73ba058,I4393afcb,Ifebd946e, ... into rvc-dev am: c119ee1ed2 am: 0e07dc6af3 -s ours am: 826ecc7d3f -s ours 
am skip reason: Change-Id I289d935f84b616ed857ef4c5a7427d57c282d00c with SHA-1 27daadb328 is in history

Change-Id: I40af096b41db07aa93267e83486e2a0a2aafc04e
 2020-05-28 21:48:59 +00:00
Maciej Żenczykowski
3a7f684429 [automerger skipped] NetworkStats: apply464xlatAdjustments - remove useBpfStats parameter. am: 19e7950e50 am: c6bd588b29 -s ours am: 65f37f3d97 -s ours 
am skip reason: Change-Id I0121a4ac7ee824adc5930bab786d550b2f00b05b with SHA-1 19e7950e50 is in history

Change-Id: Ic90310014129ae981a40439bee9ac63f01a7700a
 2020-05-28 21:48:56 +00:00
Maciej Żenczykowski
1f93189b6f [automerger skipped] fix com.android.server.net.NetworkStatsFactoryTest#testDoubleClatAccounting100MBDownload am: bcb4c0db35 am: 7e43a3c269 -s ours am: 5fd17f2bab -s ours 
am skip reason: Change-Id Ie73ba0586dafde67bc2726db26e07f7268c18be3 with SHA-1 bcb4c0db35 is in history

Change-Id: I206a22e920faafa69d9e488e8df4259eae1b144f
 2020-05-28 21:48:53 +00:00
Maciej Żenczykowski
cf4f3cd0cc [automerger skipped] fix com.android.server.net.NetworkStatsFactoryTest#testDoubleClatAccounting am: e32498e437 am: 26db3bf956 -s ours am: 5fd7326cc0 -s ours 
am skip reason: Change-Id I4393afcbe8e1bb886ecf4f5c1573f6ac8a0e29f5 with SHA-1 e32498e437 is in history

Change-Id: I9912e5d79f753016ff4103accea69e127db25485
 2020-05-28 21:48:51 +00:00
Maciej Żenczykowski
c06248f181 [automerger skipped] fix com.android.server.net.NetworkStatsFactoryTest#testDoubleClatAccountingSimple am: 27061604cf am: c02f38ad9e -s ours am: 42ada124ab -s ours 
am skip reason: Change-Id Ifebd946e06b5fa2eeb7ff4fc0b1c423097021692 with SHA-1 27061604cf is in history

Change-Id: Ia4f64e4605cc703b80c4826ca407906d3c655e27
 2020-05-28 21:48:46 +00:00
Maciej Żenczykowski
d2988e0eff [automerger skipped] fix android.net.NetworkStatsTest#testApply464xlatAdjustments am: b6662062ff am: 1e69127a39 -s ours am: 2b4284999f -s ours 
am skip reason: Change-Id Ib12ee88295eb502f6da13d212b4fd6298dea380f with SHA-1 b6662062ff is in history

Change-Id: If3d27f37ec8acd5d31c0235563b09aba2b5168a5
 2020-05-28 21:48:44 +00:00
TreeHugger Robot
826ecc7d3f [automerger skipped] Merge changes I289d935f,I0121a4ac,Ie73ba058,I4393afcb,Ifebd946e, ... into rvc-dev am: c119ee1ed2 am: 0e07dc6af3 -s ours 
am skip reason: Change-Id I289d935f84b616ed857ef4c5a7427d57c282d00c with SHA-1 27daadb328 is in history

Change-Id: Ie4ef1dcf72a003b1b2427bcaa759b1ee859db83c
 2020-05-28 21:35:55 +00:00
Maciej Żenczykowski
65f37f3d97 [automerger skipped] NetworkStats: apply464xlatAdjustments - remove useBpfStats parameter. am: 19e7950e50 am: c6bd588b29 -s ours 
am skip reason: Change-Id I0121a4ac7ee824adc5930bab786d550b2f00b05b with SHA-1 19e7950e50 is in history

Change-Id: Id17c744ef0e967217c297d86c5296d4b450e2e8e
 2020-05-28 21:35:52 +00:00