LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,721 Commits 2 Branches 0 Tags
6abc264d990e4a57981b23ea9a84ea506da9c128
Commit Graph

10721 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
6abc264d99 Merge changes I289d935f,I0121a4ac am: f71c10b698 am: 072f7070b3 am: 50681a8c21 am: 3de8ea038f am: f8e868a086 
Change-Id: I86670417a9ca01a11c4f2c13112460ab44258c14
 2020-05-28 12:04:44 +00:00
Treehugger Robot
f8e868a086 Merge changes I289d935f,I0121a4ac am: f71c10b698 am: 072f7070b3 am: 50681a8c21 am: 3de8ea038f 
Change-Id: Ic7c83378d11f97b215d315daede35c782bbacdd0
 2020-05-28 11:42:01 +00:00
Treehugger Robot
3de8ea038f Merge changes I289d935f,I0121a4ac am: f71c10b698 am: 072f7070b3 am: 50681a8c21 
Change-Id: Idb0dfe9d6e35ed439a81ed17b2cee6ae030f01f0
 2020-05-28 11:29:35 +00:00
Treehugger Robot
50681a8c21 Merge changes I289d935f,I0121a4ac am: f71c10b698 am: 072f7070b3 
Change-Id: If3c25f5a373e96fc007698ad2c5cdef5af92804a
 2020-05-28 11:08:56 +00:00
Treehugger Robot
072f7070b3 Merge changes I289d935f,I0121a4ac am: f71c10b698 
Change-Id: I7c413c9e1f2efc3aba55453c6b98bf682f3d4116
 2020-05-28 10:55:48 +00:00
Treehugger Robot
f71c10b698 Merge changes I289d935f,I0121a4ac 
* changes:
  NetworkStats: apply464xlatAdjustments - don't remove CLAT_UID
  NetworkStats: apply464xlatAdjustments - remove useBpfStats parameter.
 2020-05-28 10:34:01 +00:00
Maciej Żenczykowski
7fddc27585 Merge changes Ie73ba058,I4393afcb,Ifebd946e,Ib12ee882,Ia171b779 am: 3ee5c80eef am: 6be9b5f9ee am: dd932e6ddf am: b5fd9d5c43 am: 60bb02b17f 
Change-Id: I067445d4b712184da693a9cb15c0309fd9f2ff0d
 2020-05-28 10:30:55 +00:00
Maciej Żenczykowski
60bb02b17f Merge changes Ie73ba058,I4393afcb,Ifebd946e,Ib12ee882,Ia171b779 am: 3ee5c80eef am: 6be9b5f9ee am: dd932e6ddf am: b5fd9d5c43 
Change-Id: I003400462b333c378b1e1a2e3a3a8f57a691a5cb
 2020-05-28 10:13:38 +00:00
Maciej Żenczykowski
b5fd9d5c43 Merge changes Ie73ba058,I4393afcb,Ifebd946e,Ib12ee882,Ia171b779 am: 3ee5c80eef am: 6be9b5f9ee am: dd932e6ddf 
Change-Id: Ifb85b0402528da09f4d98939b4e365df010762c7
 2020-05-28 09:51:22 +00:00
Maciej Żenczykowski
dd932e6ddf Merge changes Ie73ba058,I4393afcb,Ifebd946e,Ib12ee882,Ia171b779 am: 3ee5c80eef am: 6be9b5f9ee 
Change-Id: If8abb4247759462532cbac6b43bfb8d3202c6e34
 2020-05-28 09:36:05 +00:00
Maciej Żenczykowski
6be9b5f9ee Merge changes Ie73ba058,I4393afcb,Ifebd946e,Ib12ee882,Ia171b779 am: 3ee5c80eef 
Change-Id: I7b9ae6590c67f89b023417e511fa823b79ad53b1
 2020-05-28 09:18:16 +00:00
Maciej Żenczykowski
3ee5c80eef Merge changes Ie73ba058,I4393afcb,Ifebd946e,Ib12ee882,Ia171b779 
* changes:
  fix com.android.server.net.NetworkStatsFactoryTest#testDoubleClatAccounting100MBDownload
  fix com.android.server.net.NetworkStatsFactoryTest#testDoubleClatAccounting
  fix com.android.server.net.NetworkStatsFactoryTest#testDoubleClatAccountingSimple
  fix android.net.NetworkStatsTest#testApply464xlatAdjustments
  NetworkStats - no need for xt_qtaguid clat bw fixups
 2020-05-28 09:04:42 +00:00
Maciej Żenczykowski
c53d85011e NetworkStats: apply464xlatAdjustments - don't remove CLAT_UID 
This should no longer be needed after all the cleanups.

Test: atest NetworkStatsTest NetworkStatsFactoryTest
Bug: 150738490
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I289d935f84b616ed857ef4c5a7427d57c282d00c
 2020-05-28 01:47:30 -07:00
Maciej Żenczykowski
c655221b40 NetworkStats: apply464xlatAdjustments - remove useBpfStats parameter. 
Test: atest NetworkStatsTest NetworkStatsFactoryTest
Bug: 150738490
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I0121a4ac7ee824adc5930bab786d550b2f00b05b
 2020-05-28 01:33:25 -07:00
Maciej Żenczykowski
aff83882db fix com.android.server.net.NetworkStatsFactoryTest#testDoubleClatAccounting100MBDownload 
No clat app uid 0 rx stats on base iface due to ip6tables raw prerouting drop

(so just copy over the rx stats from the before file)

Test: atest NetworkStatsTest NetworkStatsFactoryTest
Bug: 150738490
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ie73ba0586dafde67bc2726db26e07f7268c18be3
 2020-05-28 00:26:18 -07:00
Maciej Żenczykowski
e07d7a3536 fix com.android.server.net.NetworkStatsFactoryTest#testDoubleClatAccounting 
No clat app uid 0 rx stats on base iface due to ip6tables raw prerouting drop

Test: atest NetworkStatsFactoryTest
Bug: 150738490
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I4393afcbe8e1bb886ecf4f5c1573f6ac8a0e29f5
 2020-05-28 00:26:18 -07:00
Maciej Żenczykowski
1ed3ef2555 fix com.android.server.net.NetworkStatsFactoryTest#testDoubleClatAccountingSimple 
No clat app uid 0 rx stats on base iface due to ip6tables raw prerouting drop

Test: atest NetworkStatsFactoryTest
Bug: 150738490
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ifebd946e06b5fa2eeb7ff4fc0b1c423097021692
 2020-05-28 00:26:18 -07:00
Maciej Żenczykowski
6454bf0d9a fix android.net.NetworkStatsTest#testApply464xlatAdjustments 
Test: atest NetworkStatsTest
Bug: 150738490
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ib12ee88295eb502f6da13d212b4fd6298dea380f
 2020-05-28 00:26:18 -07:00
Automerger Merge Worker
0d4f7a5128 Merge "Merge "Adjust tests for renaming groupHint to cluster." am: f7a876947f am: 1967d09832" into rvc-dev-plus-aosp am: 2d7f36cac2 am: 695a60a378 am: 4c2dc0bd67 
Change-Id: Ia9797bb93aa4ff89147a77823d342dc22aec6a25
 2020-05-28 05:29:14 +00:00
Automerger Merge Worker
4c2dc0bd67 Merge "Merge "Adjust tests for renaming groupHint to cluster." am: f7a876947f am: 1967d09832" into rvc-dev-plus-aosp am: 2d7f36cac2 am: 695a60a378 
Change-Id: Ifec8db71ada244ab4f15410dce18152e0e822157
 2020-05-28 05:14:10 +00:00
Automerger Merge Worker
695a60a378 Merge "Merge "Adjust tests for renaming groupHint to cluster." am: f7a876947f am: 1967d09832" into rvc-dev-plus-aosp am: 2d7f36cac2 
Change-Id: I260cb22b31cd10cac603b3fef7bc2d64440b3a6f
 2020-05-28 04:56:46 +00:00
Chalard Jean
d98f7be3ad Merge "Adjust tests for renaming groupHint to cluster." am: f7a876947f am: 1967d09832 
Change-Id: Ifd2d659c4c386fb8895230ffc85b2a9086ee1a84
 2020-05-28 04:41:05 +00:00
Chalard Jean
1967d09832 Merge "Adjust tests for renaming groupHint to cluster." am: f7a876947f 
Change-Id: I65d0298b17b60c9b4266766bf74928bf967c8b60
 2020-05-28 04:29:24 +00:00
Chalard Jean
f7a876947f Merge "Adjust tests for renaming groupHint to cluster." 2020-05-28 04:20:26 +00:00
Cody Kesting
dfc033dce1 Merge "Comment reason for simulateDataStall structure." am: 7039e1cbc8 am: 6342a7d978 am: 55cc17ac7d am: aa15955b02 am: 7d024f22c3 
Change-Id: I5eb8b9e52e99a2a42cd7d7038442209b89de48ad
 2020-05-27 18:22:56 +00:00
Benedict Wong
b7730471fb [automerger skipped] Merge "Add methods for IKEv2/IPsec test mode profiles" into rvc-dev am: 4d887857e3 -s ours am: 184aea7f61 -s ours am: c76feb19fe -s ours am: 05f92d182c -s ours 
am skip reason: Change-Id I2511b39b27a1e29ae97907cdb12728d13fb1628f with SHA-1 23bd36bc04 is in history

Change-Id: I965a80da971c20403212a8dd3a3ca93f32a901a8
 2020-05-27 18:22:17 +00:00
Benedict Wong
9dc8c5fd59 [automerger skipped] Merge "Add methods for IKEv2/IPsec test mode profiles" into rvc-dev am: 4d887857e3 am: 1e6a741859 -s ours am: cd52a41670 -s ours am: 8132cb6a9e -s ours 
am skip reason: Change-Id I2511b39b27a1e29ae97907cdb12728d13fb1628f with SHA-1 23bd36bc04 is in history

Change-Id: I921db9c8123a91ef35b1519ae294e0703ad42ec9
 2020-05-27 18:20:25 +00:00
Benedict Wong
dcff03fbf6 [automerger skipped] Merge "Add methods for IKEv2/IPsec test mode profiles" into rvc-dev am: 4d887857e3 am: 1e6a741859 am: af8eb7c2ad -s ours am: 703d5c03d8 -s ours 
am skip reason: Change-Id I2511b39b27a1e29ae97907cdb12728d13fb1628f with SHA-1 cb09f72f47 is in history

Change-Id: I6188b04df9ca6d33561807128bf3344da874e37e
 2020-05-27 18:19:47 +00:00
Cody Kesting
7d024f22c3 Merge "Comment reason for simulateDataStall structure." am: 7039e1cbc8 am: 6342a7d978 am: 55cc17ac7d am: aa15955b02 
Change-Id: If3addc4180060680b80f2486839d41539caac73e
 2020-05-27 18:10:24 +00:00
Benedict Wong
05f92d182c [automerger skipped] Merge "Add methods for IKEv2/IPsec test mode profiles" into rvc-dev am: 4d887857e3 -s ours am: 184aea7f61 -s ours am: c76feb19fe -s ours 
am skip reason: Change-Id I2511b39b27a1e29ae97907cdb12728d13fb1628f with SHA-1 23bd36bc04 is in history

Change-Id: I523373d277d6ef886b81a6defe62350b2b52da34
 2020-05-27 18:09:48 +00:00
Benedict Wong
8132cb6a9e [automerger skipped] Merge "Add methods for IKEv2/IPsec test mode profiles" into rvc-dev am: 4d887857e3 am: 1e6a741859 -s ours am: cd52a41670 -s ours 
am skip reason: Change-Id I2511b39b27a1e29ae97907cdb12728d13fb1628f with SHA-1 23bd36bc04 is in history

Change-Id: Ie89bead3c4b40df52984269444953922dde2d342
 2020-05-27 18:07:42 +00:00
Benedict Wong
703d5c03d8 [automerger skipped] Merge "Add methods for IKEv2/IPsec test mode profiles" into rvc-dev am: 4d887857e3 am: 1e6a741859 am: af8eb7c2ad -s ours 
am skip reason: Change-Id I2511b39b27a1e29ae97907cdb12728d13fb1628f with SHA-1 cb09f72f47 is in history

Change-Id: Ibd430bdd090b893299bafc00d32c6d5f6b78cf92
 2020-05-27 18:06:30 +00:00
Cody Kesting
aa15955b02 Merge "Comment reason for simulateDataStall structure." am: 7039e1cbc8 am: 6342a7d978 am: 55cc17ac7d 
Change-Id: I0a59c4e0bede9b38922e4c682a7b81b3cdd92fb6
 2020-05-27 17:58:10 +00:00
Benedict Wong
c76feb19fe [automerger skipped] Merge "Add methods for IKEv2/IPsec test mode profiles" into rvc-dev am: 4d887857e3 -s ours am: 184aea7f61 -s ours 
am skip reason: Change-Id I2511b39b27a1e29ae97907cdb12728d13fb1628f with SHA-1 23bd36bc04 is in history

Change-Id: I8addd4263844d33ae759bd5d76949bddf37bce57
 2020-05-27 17:57:33 +00:00
Benedict Wong
cd52a41670 [automerger skipped] Merge "Add methods for IKEv2/IPsec test mode profiles" into rvc-dev am: 4d887857e3 am: 1e6a741859 -s ours 
am skip reason: Change-Id I2511b39b27a1e29ae97907cdb12728d13fb1628f with SHA-1 cb09f72f47 is in history

Change-Id: Icdd3089924d465a8d8dd5cd999bd292d4072f963
 2020-05-27 17:56:07 +00:00
Cody Kesting
55cc17ac7d Merge "Comment reason for simulateDataStall structure." am: 7039e1cbc8 am: 6342a7d978 
Change-Id: Ie236cb45cb2192702df4ce9aaa4e3db7fa1e007c
 2020-05-27 17:55:03 +00:00
Benedict Wong
1e6a741859 Merge "Add methods for IKEv2/IPsec test mode profiles" into rvc-dev am: 4d887857e3 
Change-Id: I38f112fbf1d0d0e8c1cf86068573d4fb94cecaa8
 2020-05-27 17:33:41 +00:00
Benedict Wong
184aea7f61 [automerger skipped] Merge "Add methods for IKEv2/IPsec test mode profiles" into rvc-dev am: 4d887857e3 -s ours 
am skip reason: Change-Id I2511b39b27a1e29ae97907cdb12728d13fb1628f with SHA-1 cb09f72f47 is in history

Change-Id: I07603bd3f06b5e8b84d778ec5a72f373cbbd2c2f
 2020-05-27 17:32:47 +00:00
Benedict Wong
4d887857e3 Merge "Add methods for IKEv2/IPsec test mode profiles" into rvc-dev 2020-05-27 17:31:00 +00:00
Cody Kesting
6342a7d978 Merge "Comment reason for simulateDataStall structure." am: 7039e1cbc8 
Change-Id: I4ef90859ba5a9b4a829016f7b20711d8734492e4
 2020-05-27 17:24:20 +00:00
Cody Kesting
7039e1cbc8 Merge "Comment reason for simulateDataStall structure." 2020-05-27 17:11:57 +00:00
Automerger Merge Worker
acca3178c8 Merge "[automerger skipped] Merge "Forward unknown Data Stall types to Connectivity Diagnostics." into rvc-dev am: 70708c54d0 -s ours am: 5db393eea6 -s ours am: d7e56132d0 -s ours am: 66931d35c8 -s ours" 2020-05-27 17:07:12 +00:00
Cody Kesting
161420f585 [automerger skipped] Merge "Forward unknown Data Stall types to Connectivity Diagnostics." into rvc-dev am: 70708c54d0 -s ours am: 5db393eea6 -s ours am: d7e56132d0 -s ours am: 66931d35c8 -s ours 
am skip reason: Change-Id I62d0bf91fcc17c7921afd519c72551399906bd6b with SHA-1 e7d4aa8d99 is in history

Change-Id: I457eddc26f541b284563557e7681b93c03afdefe
 2020-05-27 17:06:56 +00:00
Cody Kesting
73818101dc [automerger skipped] Merge "Forward unknown Data Stall types to Connectivity Diagnostics." into rvc-dev am: 70708c54d0 am: 8e1ed8867d -s ours am: d18d2f82ab -s ours am: bfefe7c18f -s ours 
am skip reason: Change-Id I62d0bf91fcc17c7921afd519c72551399906bd6b with SHA-1 e7d4aa8d99 is in history

Change-Id: I4c026948e77bbafb5b0120d7ef101250397c59cb
 2020-05-27 17:06:36 +00:00
Cody Kesting
242e8f54b5 [automerger skipped] Merge "Forward unknown Data Stall types to Connectivity Diagnostics." into rvc-dev am: 70708c54d0 am: 8e1ed8867d am: 046c7b6755 -s ours am: 95b5422b9f -s ours 
am skip reason: Change-Id I62d0bf91fcc17c7921afd519c72551399906bd6b with SHA-1 43a47efd1c is in history

Change-Id: I2e6cb835b7e4ddda2ffac98a4b70501c2e062109
 2020-05-27 17:04:22 +00:00
Cody Kesting
66931d35c8 [automerger skipped] Merge "Forward unknown Data Stall types to Connectivity Diagnostics." into rvc-dev am: 70708c54d0 -s ours am: 5db393eea6 -s ours am: d7e56132d0 -s ours 
am skip reason: Change-Id I62d0bf91fcc17c7921afd519c72551399906bd6b with SHA-1 e7d4aa8d99 is in history

Change-Id: Iaa10b9474dde08e59e67a0e59f30eb7e92e988a6
 2020-05-27 16:44:50 +00:00
Cody Kesting
bfefe7c18f [automerger skipped] Merge "Forward unknown Data Stall types to Connectivity Diagnostics." into rvc-dev am: 70708c54d0 am: 8e1ed8867d -s ours am: d18d2f82ab -s ours 
am skip reason: Change-Id I62d0bf91fcc17c7921afd519c72551399906bd6b with SHA-1 e7d4aa8d99 is in history

Change-Id: I450571c1dedacab23837308e7cc4f940cf33aa80
 2020-05-27 16:44:41 +00:00
Cody Kesting
95b5422b9f [automerger skipped] Merge "Forward unknown Data Stall types to Connectivity Diagnostics." into rvc-dev am: 70708c54d0 am: 8e1ed8867d am: 046c7b6755 -s ours 
am skip reason: Change-Id I62d0bf91fcc17c7921afd519c72551399906bd6b with SHA-1 43a47efd1c is in history

Change-Id: I8aa8c3e0d51fb2a3218162c757d164fd1b6c7922
 2020-05-27 16:43:31 +00:00
Cody Kesting
d7e56132d0 [automerger skipped] Merge "Forward unknown Data Stall types to Connectivity Diagnostics." into rvc-dev am: 70708c54d0 -s ours am: 5db393eea6 -s ours 
am skip reason: Change-Id I62d0bf91fcc17c7921afd519c72551399906bd6b with SHA-1 e7d4aa8d99 is in history

Change-Id: I966964ae60576c7fc71974435dca3a9abd5691a8
 2020-05-27 16:30:16 +00:00
Cody Kesting
d18d2f82ab [automerger skipped] Merge "Forward unknown Data Stall types to Connectivity Diagnostics." into rvc-dev am: 70708c54d0 am: 8e1ed8867d -s ours 
am skip reason: Change-Id I62d0bf91fcc17c7921afd519c72551399906bd6b with SHA-1 43a47efd1c is in history

Change-Id: I418d72c5419e7bc85bbaf741291940010f82bfdb
 2020-05-27 16:29:50 +00:00