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

10317 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
e323c7e87a Merge changes I289d935f,I0121a4ac am: 84af34369d am: 843c1661c7 am: e48eec1903 am: c2564a35f6 
Change-Id: Ic7c83378d11f97b215d315daede35c782bbacdd0
 2020-05-28 11:42:01 +00:00
Treehugger Robot
c2564a35f6 Merge changes I289d935f,I0121a4ac am: 84af34369d am: 843c1661c7 am: e48eec1903 
Change-Id: Idb0dfe9d6e35ed439a81ed17b2cee6ae030f01f0
 2020-05-28 11:29:35 +00:00
Treehugger Robot
e48eec1903 Merge changes I289d935f,I0121a4ac am: 84af34369d am: 843c1661c7 
Change-Id: If3c25f5a373e96fc007698ad2c5cdef5af92804a
 2020-05-28 11:08:56 +00:00
Treehugger Robot
843c1661c7 Merge changes I289d935f,I0121a4ac am: 84af34369d 
Change-Id: I7c413c9e1f2efc3aba55453c6b98bf682f3d4116
 2020-05-28 10:55:48 +00:00
Treehugger Robot
84af34369d 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
a05bd20ed0 Merge changes Ie73ba058,I4393afcb,Ifebd946e,Ib12ee882,Ia171b779 am: 9fb791c62d am: 62cf792d3f am: d08aecf08f am: 7f95d6e303 
Change-Id: I003400462b333c378b1e1a2e3a3a8f57a691a5cb
 2020-05-28 10:13:38 +00:00
Maciej Żenczykowski
7f95d6e303 Merge changes Ie73ba058,I4393afcb,Ifebd946e,Ib12ee882,Ia171b779 am: 9fb791c62d am: 62cf792d3f am: d08aecf08f 
Change-Id: Ifb85b0402528da09f4d98939b4e365df010762c7
 2020-05-28 09:51:22 +00:00
Maciej Żenczykowski
d08aecf08f Merge changes Ie73ba058,I4393afcb,Ifebd946e,Ib12ee882,Ia171b779 am: 9fb791c62d am: 62cf792d3f 
Change-Id: If8abb4247759462532cbac6b43bfb8d3202c6e34
 2020-05-28 09:36:05 +00:00
Maciej Żenczykowski
62cf792d3f Merge changes Ie73ba058,I4393afcb,Ifebd946e,Ib12ee882,Ia171b779 am: 9fb791c62d 
Change-Id: I7b9ae6590c67f89b023417e511fa823b79ad53b1
 2020-05-28 09:18:16 +00:00
Maciej Żenczykowski
9fb791c62d 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
bcd2b09b35 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
4bfcfc5f02 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
b053a337e3 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
2cc6ec11d7 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
51531ee376 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
f24ada13aa 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
11eba7747c Merge "Merge "Adjust tests for renaming groupHint to cluster." am: f1b1600637 am: 3d2d28eac5" into rvc-dev-plus-aosp am: 2d7f36cac2 am: 1fb73cd2d4 
Change-Id: Ifec8db71ada244ab4f15410dce18152e0e822157
 2020-05-28 05:14:10 +00:00
Automerger Merge Worker
1fb73cd2d4 Merge "Merge "Adjust tests for renaming groupHint to cluster." am: f1b1600637 am: 3d2d28eac5" into rvc-dev-plus-aosp am: 2d7f36cac2 
Change-Id: I260cb22b31cd10cac603b3fef7bc2d64440b3a6f
 2020-05-28 04:56:46 +00:00
Chalard Jean
53f0c18b8a Merge "Adjust tests for renaming groupHint to cluster." am: f1b1600637 am: 3d2d28eac5 
Change-Id: Ifd2d659c4c386fb8895230ffc85b2a9086ee1a84
 2020-05-28 04:41:05 +00:00
Chalard Jean
3d2d28eac5 Merge "Adjust tests for renaming groupHint to cluster." am: f1b1600637 
Change-Id: I65d0298b17b60c9b4266766bf74928bf967c8b60
 2020-05-28 04:29:24 +00:00
Chalard Jean
f1b1600637 Merge "Adjust tests for renaming groupHint to cluster." 2020-05-28 04:20:26 +00:00
Cody Kesting
b442d78695 Merge "Comment reason for simulateDataStall structure." am: f79e9c87aa am: f67675fb76 am: 0e42e708e2 am: b9e9d6c8ff 
Change-Id: If3addc4180060680b80f2486839d41539caac73e
 2020-05-27 18:10:24 +00:00
Benedict Wong
a9407e7516 [automerger skipped] Merge "Add methods for IKEv2/IPsec test mode profiles" into rvc-dev am: 363674479d -s ours am: e1fc3ee141 -s ours am: 6a65824a11 -s ours 
am skip reason: Change-Id I2511b39b27a1e29ae97907cdb12728d13fb1628f with SHA-1 01ca51a900 is in history

Change-Id: I523373d277d6ef886b81a6defe62350b2b52da34
 2020-05-27 18:09:48 +00:00
Benedict Wong
c22d1fc574 [automerger skipped] Merge "Add methods for IKEv2/IPsec test mode profiles" into rvc-dev am: 363674479d am: fb7c2aea65 -s ours am: 5c1ee6c165 -s ours 
am skip reason: Change-Id I2511b39b27a1e29ae97907cdb12728d13fb1628f with SHA-1 01ca51a900 is in history

Change-Id: Ie89bead3c4b40df52984269444953922dde2d342
 2020-05-27 18:07:42 +00:00
Benedict Wong
afe2a5400e [automerger skipped] Merge "Add methods for IKEv2/IPsec test mode profiles" into rvc-dev am: 363674479d am: fb7c2aea65 am: af8eb7c2ad -s ours 
am skip reason: Change-Id I2511b39b27a1e29ae97907cdb12728d13fb1628f with SHA-1 0d7bed76cb is in history

Change-Id: Ibd430bdd090b893299bafc00d32c6d5f6b78cf92
 2020-05-27 18:06:30 +00:00
Cody Kesting
b9e9d6c8ff Merge "Comment reason for simulateDataStall structure." am: f79e9c87aa am: f67675fb76 am: 0e42e708e2 
Change-Id: I0a59c4e0bede9b38922e4c682a7b81b3cdd92fb6
 2020-05-27 17:58:10 +00:00
Benedict Wong
6a65824a11 [automerger skipped] Merge "Add methods for IKEv2/IPsec test mode profiles" into rvc-dev am: 363674479d -s ours am: e1fc3ee141 -s ours 
am skip reason: Change-Id I2511b39b27a1e29ae97907cdb12728d13fb1628f with SHA-1 01ca51a900 is in history

Change-Id: I8addd4263844d33ae759bd5d76949bddf37bce57
 2020-05-27 17:57:33 +00:00
Benedict Wong
5c1ee6c165 [automerger skipped] Merge "Add methods for IKEv2/IPsec test mode profiles" into rvc-dev am: 363674479d am: fb7c2aea65 -s ours 
am skip reason: Change-Id I2511b39b27a1e29ae97907cdb12728d13fb1628f with SHA-1 0d7bed76cb is in history

Change-Id: Icdd3089924d465a8d8dd5cd999bd292d4072f963
 2020-05-27 17:56:07 +00:00
Cody Kesting
0e42e708e2 Merge "Comment reason for simulateDataStall structure." am: f79e9c87aa am: f67675fb76 
Change-Id: Ie236cb45cb2192702df4ce9aaa4e3db7fa1e007c
 2020-05-27 17:55:03 +00:00
Benedict Wong
fb7c2aea65 Merge "Add methods for IKEv2/IPsec test mode profiles" into rvc-dev am: 363674479d 
Change-Id: I38f112fbf1d0d0e8c1cf86068573d4fb94cecaa8
 2020-05-27 17:33:41 +00:00
Benedict Wong
e1fc3ee141 [automerger skipped] Merge "Add methods for IKEv2/IPsec test mode profiles" into rvc-dev am: 363674479d -s ours 
am skip reason: Change-Id I2511b39b27a1e29ae97907cdb12728d13fb1628f with SHA-1 0d7bed76cb is in history

Change-Id: I07603bd3f06b5e8b84d778ec5a72f373cbbd2c2f
 2020-05-27 17:32:47 +00:00
Benedict Wong
363674479d Merge "Add methods for IKEv2/IPsec test mode profiles" into rvc-dev 2020-05-27 17:31:00 +00:00
Cody Kesting
f67675fb76 Merge "Comment reason for simulateDataStall structure." am: f79e9c87aa 
Change-Id: I4ef90859ba5a9b4a829016f7b20711d8734492e4
 2020-05-27 17:24:20 +00:00
Cody Kesting
f79e9c87aa Merge "Comment reason for simulateDataStall structure." 2020-05-27 17:11:57 +00:00
Cody Kesting
4cd53d8fe0 [automerger skipped] Merge "Forward unknown Data Stall types to Connectivity Diagnostics." into rvc-dev am: 4f8514c545 -s ours am: f7c8078532 -s ours am: c2ff548854 -s ours 
am skip reason: Change-Id I62d0bf91fcc17c7921afd519c72551399906bd6b with SHA-1 80aec1d4ff is in history

Change-Id: Iaa10b9474dde08e59e67a0e59f30eb7e92e988a6
 2020-05-27 16:44:50 +00:00
Cody Kesting
3d84add1c1 [automerger skipped] Merge "Forward unknown Data Stall types to Connectivity Diagnostics." into rvc-dev am: 4f8514c545 am: 64a368f2d5 -s ours am: f54feb0beb -s ours 
am skip reason: Change-Id I62d0bf91fcc17c7921afd519c72551399906bd6b with SHA-1 80aec1d4ff is in history

Change-Id: I450571c1dedacab23837308e7cc4f940cf33aa80
 2020-05-27 16:44:41 +00:00
Cody Kesting
4ea852ccaa [automerger skipped] Merge "Forward unknown Data Stall types to Connectivity Diagnostics." into rvc-dev am: 4f8514c545 am: 64a368f2d5 am: 046c7b6755 -s ours 
am skip reason: Change-Id I62d0bf91fcc17c7921afd519c72551399906bd6b with SHA-1 b37958eec9 is in history

Change-Id: I8aa8c3e0d51fb2a3218162c757d164fd1b6c7922
 2020-05-27 16:43:31 +00:00
Cody Kesting
c2ff548854 [automerger skipped] Merge "Forward unknown Data Stall types to Connectivity Diagnostics." into rvc-dev am: 4f8514c545 -s ours am: f7c8078532 -s ours 
am skip reason: Change-Id I62d0bf91fcc17c7921afd519c72551399906bd6b with SHA-1 80aec1d4ff is in history

Change-Id: I966964ae60576c7fc71974435dca3a9abd5691a8
 2020-05-27 16:30:16 +00:00
Cody Kesting
f54feb0beb [automerger skipped] Merge "Forward unknown Data Stall types to Connectivity Diagnostics." into rvc-dev am: 4f8514c545 am: 64a368f2d5 -s ours 
am skip reason: Change-Id I62d0bf91fcc17c7921afd519c72551399906bd6b with SHA-1 b37958eec9 is in history

Change-Id: I418d72c5419e7bc85bbaf741291940010f82bfdb
 2020-05-27 16:29:50 +00:00
Cody Kesting
64a368f2d5 Merge "Forward unknown Data Stall types to Connectivity Diagnostics." into rvc-dev am: 4f8514c545 
Change-Id: I09582c2cac562751e3e33357a5f43083eb4c6d1a
 2020-05-27 16:18:30 +00:00
Cody Kesting
f7c8078532 [automerger skipped] Merge "Forward unknown Data Stall types to Connectivity Diagnostics." into rvc-dev am: 4f8514c545 -s ours 
am skip reason: Change-Id I62d0bf91fcc17c7921afd519c72551399906bd6b with SHA-1 b37958eec9 is in history

Change-Id: Ie80d01ef3c50a85b55d54161c98126c49d46c4af
 2020-05-27 16:17:36 +00:00
Cody Kesting
4f8514c545 Merge "Forward unknown Data Stall types to Connectivity Diagnostics." into rvc-dev 2020-05-27 16:03:38 +00:00
Automerger Merge Worker
d87e2586b4 Merge "[automerger skipped] Inform the DNS resolver when it needs to do DNS64 synthesis. am: 37aa693fb5 -s ours am: 7e93b0f511 -s ours" into rvc-d1-dev-plus-aosp am: dadab63a42 -s ours 
am skip reason: Change-Id If8ad2d30712a6df3e207c8d3e8a129705242191e with SHA-1 37aa693fb5 is in history

Change-Id: I01ad9fba695fe8fb1d3fc6ff047edaf68dcc10a1
 2020-05-26 15:00:10 +00:00
Lorenzo Colitti
67346516bf [automerger skipped] Inform the DNS resolver when it needs to do DNS64 synthesis. am: 37aa693fb5 am: fdb0f113c7 -s ours am: f317c73b65 -s ours 
am skip reason: Change-Id If8ad2d30712a6df3e207c8d3e8a129705242191e with SHA-1 b432bc75e5 is in history

Change-Id: I3bd93690434a286a776199d7c3e7faf52e9f97b7
 2020-05-26 14:59:41 +00:00
Lorenzo Colitti
47c89256fc [automerger skipped] Inform the DNS resolver when it needs to do DNS64 synthesis. am: 37aa693fb5 -s ours am: 7e93b0f511 -s ours 
am skip reason: Change-Id If8ad2d30712a6df3e207c8d3e8a129705242191e with SHA-1 b432bc75e5 is in history

Change-Id: I555fef9a552f36a1f7570ee8819d8aa2620c52d7
 2020-05-26 14:44:22 +00:00
Lorenzo Colitti
f317c73b65 [automerger skipped] Inform the DNS resolver when it needs to do DNS64 synthesis. am: 37aa693fb5 am: fdb0f113c7 -s ours 
am skip reason: Change-Id If8ad2d30712a6df3e207c8d3e8a129705242191e with SHA-1 b432bc75e5 is in history

Change-Id: Ide2ea957cb63654eb54bed449ab04e250f5ca904
 2020-05-26 14:44:07 +00:00
Lorenzo Colitti
7e93b0f511 [automerger skipped] Inform the DNS resolver when it needs to do DNS64 synthesis. am: 37aa693fb5 -s ours 
am skip reason: Change-Id If8ad2d30712a6df3e207c8d3e8a129705242191e with SHA-1 b432bc75e5 is in history

Change-Id: Iec52ca510f3c066abbd96636c595acb89828c29a
 2020-05-26 14:29:28 +00:00
Lorenzo Colitti
fdb0f113c7 Inform the DNS resolver when it needs to do DNS64 synthesis. am: 37aa693fb5 
Change-Id: Ic418b02d68985a6a8ea22d845ad57349468b4dcd
 2020-05-26 14:29:13 +00:00
Automerger Merge Worker
8eb4c8bbeb Merge "[automerger skipped] Test that if an RA sets the same prefix as DNS, nothing happens. am: 0424f88915 am: 0d25cca3c9 am: 627e36992b -s ours" into rvc-qpr-dev-plus-aosp 2020-05-26 13:23:11 +00:00
Lorenzo Colitti
c97a8ab4a7 [automerger skipped] Test that if an RA sets the same prefix as DNS, nothing happens. am: 0424f88915 -s ours am: bf9c472efa -s ours am: 796e6aa087 -s ours 
am skip reason: Change-Id I3316d49d42100800740afadc4edf0a13a4d8377c with SHA-1 0424f88915 is in history

Change-Id: I2cc0163b25e772786b9c64dca9d354bc4d66044c
 2020-05-26 13:23:01 +00:00