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

10808 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
2796382103 Comment reason for simulateDataStall structure. 
This change adds a comment to CS#simulateDataStall to explain why the
Data Stall is wrapped in a DataStallReportParcelable before being passed
to the ConnectivityDiagnostics handler. This approach is taken to ensure
that simulated data stalls are handled the exact same as Data Stalls
received directly from NetworkMonitor (including Data Stalls detected by
methods that the platform does not understand).

Bug: 156294356
Test: atest ConnectivityDiagnosticsManager
Change-Id: I751054418bf328c72b977a1cc99c27cb9b8ab7ba
Merged-In: I751054418bf328c72b977a1cc99c27cb9b8ab7ba
(cherry picked from commit c86db7497a27cfbac5c662911a295598b1335bc0)
 2020-05-28 00:40:43 +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
Benedict Wong
d196714698 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
 2020-05-27 02:05:49 -07: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
Lorenzo Colitti
c1759cf7e9 [automerger skipped] Test that if an RA sets the same prefix as DNS, nothing happens. am: 0424f88915 am: 0d25cca3c9 am: 627e36992b -s ours 
am skip reason: Change-Id I3316d49d42100800740afadc4edf0a13a4d8377c with SHA-1 16b28e2b22 is in history

Change-Id: I3df201e84534868fcca0deb79db41e1129cba284
 2020-05-26 13:22:59 +00:00
Lorenzo Colitti
09a4a85da5 [automerger skipped] Test that if an RA sets the same prefix as DNS, nothing happens. am: 0424f88915 am: 0d25cca3c9 -s ours am: 201afcb950 -s ours 
am skip reason: Change-Id I3316d49d42100800740afadc4edf0a13a4d8377c with SHA-1 16b28e2b22 is in history

Change-Id: I8b4b33ce6742605690e2498054441ba7f5972347
 2020-05-26 13:22:50 +00:00
Lorenzo Colitti
796e6aa087 [automerger skipped] Test that if an RA sets the same prefix as DNS, nothing happens. am: 0424f88915 -s ours am: bf9c472efa -s ours 
am skip reason: Change-Id I3316d49d42100800740afadc4edf0a13a4d8377c with SHA-1 0424f88915 is in history

Change-Id: Icb5f3ccb42469f84770a9a4b8a1dc990c67a9376
 2020-05-26 13:10:39 +00:00
Lorenzo Colitti
201afcb950 [automerger skipped] Test that if an RA sets the same prefix as DNS, nothing happens. am: 0424f88915 am: 0d25cca3c9 -s ours 
am skip reason: Change-Id I3316d49d42100800740afadc4edf0a13a4d8377c with SHA-1 16b28e2b22 is in history

Change-Id: Ie0482e523786bc79a414bf1bb38195365c3bef42
 2020-05-26 13:10:23 +00:00
Lorenzo Colitti
bf9c472efa [automerger skipped] Test that if an RA sets the same prefix as DNS, nothing happens. am: 0424f88915 -s ours 
am skip reason: Change-Id I3316d49d42100800740afadc4edf0a13a4d8377c with SHA-1 16b28e2b22 is in history

Change-Id: I3e050057ba6ac95d789ed7f34f390bec586d84b7
 2020-05-26 12:58:24 +00:00
Lorenzo Colitti
0d25cca3c9 Test that if an RA sets the same prefix as DNS, nothing happens. am: 0424f88915 
Change-Id: I171ff7fd8140028dc4a4e7df5cc4663b8ad696e7
 2020-05-26 12:58:22 +00:00
Lorenzo Colitti
37aa693fb5 Inform the DNS resolver when it needs to do DNS64 synthesis. 
This is only necessary when learning the NAT64 prefix from the
RA, because if the NAT64 prefix is learned from DNS, the DNS
resolver already knows the prefix and automatically enables
DNS64 synthesis.

The DNS resolver needs to be informed of the prefix any time
clat is running on a prefix learned from an RA. This is simple to
implement: just set the prefix when starting clat if prefix
discovery is not running, and clear the prefix when stopping clat
if prefix discovery was not running. This ensures that the prefix
is cleared iff it was set.

Bug: 156914456
Test: new unit test coverage
Original-Change: https://android-review.googlesource.com/1315578
Merged-In: If8ad2d30712a6df3e207c8d3e8a129705242191e
Change-Id: If8ad2d30712a6df3e207c8d3e8a129705242191e
 2020-05-26 11:52:35 +00:00
Lorenzo Colitti
0424f88915 Test that if an RA sets the same prefix as DNS, nothing happens. 
This is not particularly likely to happen unless the pref64 RA is
sent by a different router than the main RA. But more tests are
always good, and this additional coverage will be more useful
in an upcoming change.

Bug: 150648313
Test: test-only change
Original-Change: https://android-review.googlesource.com/1316094
Merged-In: I3316d49d42100800740afadc4edf0a13a4d8377c
Change-Id: I3316d49d42100800740afadc4edf0a13a4d8377c
 2020-05-26 11:35:33 +00:00
Lorenzo Colitti
6347bb88e8 Merge "Inform the DNS resolver when it needs to do DNS64 synthesis." am: c0ba5bf41d am: df775be39f am: 79fde3a970 am: 8581549488 
Change-Id: I717046592a6535d39b8def912c7b78a071ae5a99
 2020-05-26 10:46:22 +00:00