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

10367 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Maciej Żenczykowski
5fd17f2bab [automerger skipped] fix com.android.server.net.NetworkStatsFactoryTest#testDoubleClatAccounting100MBDownload am: bcb4c0db35 am: 7e43a3c269 -s ours 
am skip reason: Change-Id Ie73ba0586dafde67bc2726db26e07f7268c18be3 with SHA-1 bcb4c0db35 is in history

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

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

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

Change-Id: I7d29d30d5ba68dd0cf3d8b10e229f7de7fec947a
 2020-05-28 21:35:22 +00:00
TreeHugger Robot
0e07dc6af3 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
c6bd588b29 NetworkStats: apply464xlatAdjustments - remove useBpfStats parameter. am: 19e7950e50 
Change-Id: Ibaee70f31f27f7457bd8524d4ab62bc76fff5dea
 2020-05-28 21:28:25 +00:00
Maciej Żenczykowski
7e43a3c269 fix com.android.server.net.NetworkStatsFactoryTest#testDoubleClatAccounting100MBDownload am: bcb4c0db35 
Change-Id: I9fea19ddd38b51b65f79c59a53739e94dc833152
 2020-05-28 21:28:23 +00:00
Maciej Żenczykowski
26db3bf956 fix com.android.server.net.NetworkStatsFactoryTest#testDoubleClatAccounting am: e32498e437 
Change-Id: Ifc902659ea23b9361c57e4b30a55427924c79b5e
 2020-05-28 21:28:15 +00:00
Maciej Żenczykowski
c02f38ad9e fix com.android.server.net.NetworkStatsFactoryTest#testDoubleClatAccountingSimple am: 27061604cf 
Change-Id: Id47ec36c825e2ec4258a61a01a724bc2a0a94166
 2020-05-28 21:28:13 +00:00
Maciej Żenczykowski
1e69127a39 fix android.net.NetworkStatsTest#testApply464xlatAdjustments am: b6662062ff 
Change-Id: I039caa0891030a5ebeba87ebfc410e72bd6c8d00
 2020-05-28 21:28:10 +00:00
TreeHugger Robot
0e8409a14b [automerger skipped] Merge changes I289d935f,I0121a4ac,Ie73ba058,I4393afcb,Ifebd946e, ... into rvc-dev am: c119ee1ed2 -s ours am: 377a674540 -s ours am: bb8ab18d7e -s ours 
am skip reason: Change-Id I289d935f84b616ed857ef4c5a7427d57c282d00c with SHA-1 bcd2b09b35 is in history

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

Change-Id: I308d86910c877702cda6d0f3093c66700c68a862
 2020-05-28 13:59:38 +00:00
TreeHugger Robot
377a674540 [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 bcd2b09b35 is in history

Change-Id: I9e2e5b2862a2a381c437669427c0ef02a3905dc4
 2020-05-28 13:31:18 +00:00
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
27daadb328 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