LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,350 Commits 2 Branches 0 Tags
3541d26a05ec132bbcfb89f268d2a01b3387eadf
Commit Graph

10350 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Maciej Żenczykowski
51a82e1927 [automerger skipped] NetworkStats: apply464xlatAdjustments - remove useBpfStats parameter. am: 2996dbca66 am: 8548a852bc -s ours am: d7787c9582 -s ours 
am skip reason: Change-Id I0121a4ac7ee824adc5930bab786d550b2f00b05b with SHA-1 2996dbca66 is in history

Change-Id: Ic90310014129ae981a40439bee9ac63f01a7700a
 2020-05-28 21:48:56 +00:00
Maciej Żenczykowski
20114354e9 [automerger skipped] fix com.android.server.net.NetworkStatsFactoryTest#testDoubleClatAccounting100MBDownload am: b6e56b637c am: a8c10abcb2 -s ours am: 9572d5b1ab -s ours 
am skip reason: Change-Id Ie73ba0586dafde67bc2726db26e07f7268c18be3 with SHA-1 b6e56b637c is in history

Change-Id: I206a22e920faafa69d9e488e8df4259eae1b144f
 2020-05-28 21:48:53 +00:00
Maciej Żenczykowski
e5fc001e39 [automerger skipped] fix com.android.server.net.NetworkStatsFactoryTest#testDoubleClatAccounting am: 798804037d am: 9eeba033f6 -s ours am: 035a2d7a3b -s ours 
am skip reason: Change-Id I4393afcbe8e1bb886ecf4f5c1573f6ac8a0e29f5 with SHA-1 798804037d is in history

Change-Id: I9912e5d79f753016ff4103accea69e127db25485
 2020-05-28 21:48:51 +00:00
Maciej Żenczykowski
98a3d9436b [automerger skipped] fix com.android.server.net.NetworkStatsFactoryTest#testDoubleClatAccountingSimple am: 8dfa72888d am: b7effcdaba -s ours am: 29a4a7e805 -s ours 
am skip reason: Change-Id Ifebd946e06b5fa2eeb7ff4fc0b1c423097021692 with SHA-1 8dfa72888d is in history

Change-Id: Ia4f64e4605cc703b80c4826ca407906d3c655e27
 2020-05-28 21:48:46 +00:00
Maciej Żenczykowski
689ea76adf [automerger skipped] fix android.net.NetworkStatsTest#testApply464xlatAdjustments am: eddd5871ed am: 536b889f7b -s ours am: 1ab6890e12 -s ours 
am skip reason: Change-Id Ib12ee88295eb502f6da13d212b4fd6298dea380f with SHA-1 eddd5871ed is in history

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

Change-Id: Ie4ef1dcf72a003b1b2427bcaa759b1ee859db83c
 2020-05-28 21:35:55 +00:00
Maciej Żenczykowski
d7787c9582 [automerger skipped] NetworkStats: apply464xlatAdjustments - remove useBpfStats parameter. am: 2996dbca66 am: 8548a852bc -s ours 
am skip reason: Change-Id I0121a4ac7ee824adc5930bab786d550b2f00b05b with SHA-1 2996dbca66 is in history

Change-Id: Id17c744ef0e967217c297d86c5296d4b450e2e8e
 2020-05-28 21:35:52 +00:00
Maciej Żenczykowski
9572d5b1ab [automerger skipped] fix com.android.server.net.NetworkStatsFactoryTest#testDoubleClatAccounting100MBDownload am: b6e56b637c am: a8c10abcb2 -s ours 
am skip reason: Change-Id Ie73ba0586dafde67bc2726db26e07f7268c18be3 with SHA-1 b6e56b637c is in history

Change-Id: Ibfe2701d288ef4567c3efe0226376041d4d374bb
 2020-05-28 21:35:49 +00:00
Maciej Żenczykowski
035a2d7a3b [automerger skipped] fix com.android.server.net.NetworkStatsFactoryTest#testDoubleClatAccounting am: 798804037d am: 9eeba033f6 -s ours 
am skip reason: Change-Id I4393afcbe8e1bb886ecf4f5c1573f6ac8a0e29f5 with SHA-1 798804037d is in history

Change-Id: I38441c352f6fb7736e65014f39237d930b5fbc83
 2020-05-28 21:35:40 +00:00
Maciej Żenczykowski
29a4a7e805 [automerger skipped] fix com.android.server.net.NetworkStatsFactoryTest#testDoubleClatAccountingSimple am: 8dfa72888d am: b7effcdaba -s ours 
am skip reason: Change-Id Ifebd946e06b5fa2eeb7ff4fc0b1c423097021692 with SHA-1 8dfa72888d is in history

Change-Id: Idb4cd1a022c9321fa5d8f0a9707dbcd13a866f21
 2020-05-28 21:35:34 +00:00
Maciej Żenczykowski
1ab6890e12 [automerger skipped] fix android.net.NetworkStatsTest#testApply464xlatAdjustments am: eddd5871ed am: 536b889f7b -s ours 
am skip reason: Change-Id Ib12ee88295eb502f6da13d212b4fd6298dea380f with SHA-1 eddd5871ed is in history

Change-Id: I7d29d30d5ba68dd0cf3d8b10e229f7de7fec947a
 2020-05-28 21:35:22 +00:00
TreeHugger Robot
d157591df7 Merge changes I289d935f,I0121a4ac,Ie73ba058,I4393afcb,Ifebd946e, ... into rvc-dev am: c119ee1ed2 
Change-Id: Iec9a061d0f91993e65c5d110955e8f23b0f0d945
 2020-05-28 21:28:28 +00:00
Maciej Żenczykowski
8548a852bc NetworkStats: apply464xlatAdjustments - remove useBpfStats parameter. am: 2996dbca66 
Change-Id: Ibaee70f31f27f7457bd8524d4ab62bc76fff5dea
 2020-05-28 21:28:25 +00:00
Maciej Żenczykowski
a8c10abcb2 fix com.android.server.net.NetworkStatsFactoryTest#testDoubleClatAccounting100MBDownload am: b6e56b637c 
Change-Id: I9fea19ddd38b51b65f79c59a53739e94dc833152
 2020-05-28 21:28:23 +00:00
Maciej Żenczykowski
9eeba033f6 fix com.android.server.net.NetworkStatsFactoryTest#testDoubleClatAccounting am: 798804037d 
Change-Id: Ifc902659ea23b9361c57e4b30a55427924c79b5e
 2020-05-28 21:28:15 +00:00
Maciej Żenczykowski
b7effcdaba fix com.android.server.net.NetworkStatsFactoryTest#testDoubleClatAccountingSimple am: 8dfa72888d 
Change-Id: Id47ec36c825e2ec4258a61a01a724bc2a0a94166
 2020-05-28 21:28:13 +00:00
Maciej Żenczykowski
536b889f7b fix android.net.NetworkStatsTest#testApply464xlatAdjustments am: eddd5871ed 
Change-Id: I039caa0891030a5ebeba87ebfc410e72bd6c8d00
 2020-05-28 21:28:10 +00:00
TreeHugger Robot
ad6d92a1c6 [automerger skipped] Merge changes I289d935f,I0121a4ac,Ie73ba058,I4393afcb,Ifebd946e, ... into rvc-dev am: c119ee1ed2 -s ours am: bf12704fae -s ours am: a8d55cf382 -s ours 
am skip reason: Change-Id I289d935f84b616ed857ef4c5a7427d57c282d00c with SHA-1 c53d85011e is in history

Change-Id: I9600de066578322aed052b74960f122f0f8ca3e1
 2020-05-28 14:18:34 +00:00
TreeHugger Robot
a8d55cf382 [automerger skipped] Merge changes I289d935f,I0121a4ac,Ie73ba058,I4393afcb,Ifebd946e, ... into rvc-dev am: c119ee1ed2 -s ours am: bf12704fae -s ours 
am skip reason: Change-Id I289d935f84b616ed857ef4c5a7427d57c282d00c with SHA-1 c53d85011e is in history

Change-Id: I308d86910c877702cda6d0f3093c66700c68a862
 2020-05-28 13:59:38 +00:00
TreeHugger Robot
bf12704fae [automerger skipped] Merge changes I289d935f,I0121a4ac,Ie73ba058,I4393afcb,Ifebd946e, ... into rvc-dev am: c119ee1ed2 -s ours 
am skip reason: Change-Id I289d935f84b616ed857ef4c5a7427d57c282d00c with SHA-1 c53d85011e is in history

Change-Id: I9e2e5b2862a2a381c437669427c0ef02a3905dc4
 2020-05-28 13:31:18 +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
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
bde194b816 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
Merged-In: I289d935f84b616ed857ef4c5a7427d57c282d00c
 2020-05-28 02:44:20 -07:00
Maciej Żenczykowski
2996dbca66 NetworkStats: apply464xlatAdjustments - remove useBpfStats parameter. 
Test: atest NetworkStatsTest NetworkStatsFactoryTest
Bug: 150738490
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I0121a4ac7ee824adc5930bab786d550b2f00b05b
Merged-In: I0121a4ac7ee824adc5930bab786d550b2f00b05b
 2020-05-28 02:44:10 -07:00
Maciej Żenczykowski
b6e56b637c 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
Merged-In: Ie73ba0586dafde67bc2726db26e07f7268c18be3
 2020-05-28 02:44:02 -07:00
Maciej Żenczykowski
798804037d 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
Merged-In: I4393afcbe8e1bb886ecf4f5c1573f6ac8a0e29f5
 2020-05-28 02:43:53 -07:00
Maciej Żenczykowski
8dfa72888d 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
Merged-In: Ifebd946e06b5fa2eeb7ff4fc0b1c423097021692
 2020-05-28 02:43:44 -07:00
Maciej Żenczykowski
eddd5871ed fix android.net.NetworkStatsTest#testApply464xlatAdjustments 
Test: atest NetworkStatsTest
Bug: 150738490
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ib12ee88295eb502f6da13d212b4fd6298dea380f
Merged-In: Ib12ee88295eb502f6da13d212b4fd6298dea380f
 2020-05-28 02:43:33 -07: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
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