Commit Graph

10069 Commits

Author SHA1 Message Date
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
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
363674479d Merge "Add methods for IKEv2/IPsec test mode profiles" into rvc-dev 2020-05-27 17:31:00 +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
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
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
8581549488 Merge "Inform the DNS resolver when it needs to do DNS64 synthesis." am: c0ba5bf41d am: df775be39f am: 79fde3a970
Change-Id: I38aa313a3e0b8c9f7a401f1a56f808e5fe723525
2020-05-26 10:28:04 +00:00
Lorenzo Colitti
79fde3a970 Merge "Inform the DNS resolver when it needs to do DNS64 synthesis." am: c0ba5bf41d am: df775be39f
Change-Id: I06278ddff31d8c0dbb4ce6cfded01a38369d8a3c
2020-05-26 10:13:17 +00:00
Lorenzo Colitti
df775be39f Merge "Inform the DNS resolver when it needs to do DNS64 synthesis." am: c0ba5bf41d
Change-Id: Ia18f83bd6a22f255bf17792ebc14e485810a39cd
2020-05-26 09:49:13 +00:00
Lorenzo Colitti
c0ba5bf41d Merge "Inform the DNS resolver when it needs to do DNS64 synthesis." 2020-05-26 09:26:46 +00:00
Lorenzo Colitti
281e5a02ae Merge "Test that if an RA sets the same prefix as DNS, nothing happens." am: eafdd034f8 am: fcf8e6a45a am: cc2ab62176
Change-Id: I5bbb8e5adb2fb2a961fcc64b7952204bb1bb3b0d
2020-05-24 11:43:14 +00:00
Lorenzo Colitti
cc2ab62176 Merge "Test that if an RA sets the same prefix as DNS, nothing happens." am: eafdd034f8 am: fcf8e6a45a
Change-Id: Ib2eb07e3794630cc636759ce6a6529b7b56a3cfe
2020-05-24 11:30:55 +00:00
Lorenzo Colitti
fcf8e6a45a Merge "Test that if an RA sets the same prefix as DNS, nothing happens." am: eafdd034f8
Change-Id: I61f7ad698fb5b086f5e284309a21f56314d8163f
2020-05-24 11:17:02 +00:00
Lorenzo Colitti
eafdd034f8 Merge "Test that if an RA sets the same prefix as DNS, nothing happens." 2020-05-24 10:59:40 +00:00
Cody Kesting
80aec1d4ff Forward unknown Data Stall types to Connectivity Diagnostics.
This CL forwards suspected Data Stall events detected with unknown
detection methods to ConnectivityDiagnostics.

Currently, ConnectivityService drops any data stall events with unknown
detection methods, which leads to false negatives for Connectivity
Diagnostics registrants. This change ensures that registrants will still
be notified as NetworkStack is updated to use new detection methods.

The documentation for ConnectivityDiagnosticsManager#DataStallReport is
also updated to reflect that the detection methods included in the
report are a bit mask of detection methods used. Implicitly, this means
that data stalls detected via unknown methods will have an empty bit
mask (0x00).

Bug: 156294356
Test: atest ConnectivityDiagnosticsManager
Change-Id: I62d0bf91fcc17c7921afd519c72551399906bd6b
Merged-In: I62d0bf91fcc17c7921afd519c72551399906bd6b
(cherry picked from commit a1d9d811a05bf3447ebb90a39343b53eee79f0db)
2020-05-22 19:12:14 +00:00
Cody Kesting
610bb1cab3 Merge "Forward unknown Data Stall types to Connectivity Diagnostics." am: b10df0da89 am: 8c5375cec3 am: 1dc1ba0bb0
Change-Id: I33a89a56431f168f7bfeb72e2eabef9010685940
2020-05-21 23:50:03 +00:00
Cody Kesting
1dc1ba0bb0 Merge "Forward unknown Data Stall types to Connectivity Diagnostics." am: b10df0da89 am: 8c5375cec3
Change-Id: I31d17c5c353e822f3d48166ffe9cc39abd31c198
2020-05-21 23:35:38 +00:00
Cody Kesting
8c5375cec3 Merge "Forward unknown Data Stall types to Connectivity Diagnostics." am: b10df0da89
Change-Id: Ifc49eb81c219d1ba036c11887e2bc686a68dd67d
2020-05-21 23:19:30 +00:00
Cody Kesting
b10df0da89 Merge "Forward unknown Data Stall types to Connectivity Diagnostics." 2020-05-21 22:58:29 +00:00
Cody Kesting
9576a5d773 [automerger skipped] Merge "Move Data Stall logic to CS from NetworkMonitorCallbacks." into rvc-dev am: 9b616b851f -s ours am: 0880e7a979 -s ours
am skip reason: Change-Id Ie2f6a1a2376c5c452750ab417cb5e8c24fc44fc3 with SHA-1 15eb17c2fc is in history

Change-Id: Ibeb7ba515d11c4dcf74b0d8f504adeff007ff444
2020-05-21 16:25:23 +00:00
Cody Kesting
371dc8ed24 [automerger skipped] Merge "Move Data Stall logic to CS from NetworkMonitorCallbacks." into rvc-dev am: 9b616b851f am: 88d9f6bd64 -s ours
am skip reason: Change-Id Ie2f6a1a2376c5c452750ab417cb5e8c24fc44fc3 with SHA-1 f5cc4eae9e is in history

Change-Id: I3f89d4dd79935d26629dbd06c06f2784ded317e8
2020-05-21 16:24:02 +00:00
Cody Kesting
88d9f6bd64 Merge "Move Data Stall logic to CS from NetworkMonitorCallbacks." into rvc-dev am: 9b616b851f
Change-Id: I75c162680fa548da20a8ab3dcf664dd57feb9002
2020-05-21 16:04:19 +00:00
Cody Kesting
0880e7a979 [automerger skipped] Merge "Move Data Stall logic to CS from NetworkMonitorCallbacks." into rvc-dev am: 9b616b851f -s ours
am skip reason: Change-Id Ie2f6a1a2376c5c452750ab417cb5e8c24fc44fc3 with SHA-1 f5cc4eae9e is in history

Change-Id: I376f8021b63cc21393de7eba8f0ad26650eedab5
2020-05-21 16:04:17 +00:00
Cody Kesting
9b616b851f Merge "Move Data Stall logic to CS from NetworkMonitorCallbacks." into rvc-dev 2020-05-21 16:01:01 +00:00
Lorenzo Colitti
b432bc75e5 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
Change-Id: If8ad2d30712a6df3e207c8d3e8a129705242191e
2020-05-21 23:32:57 +09:00
Treehugger Robot
f445b655f6 Merge "Suppress deprecation warnings in LegacyTypeTrackerTest." am: 8d55b55f60 am: 2911ce534e am: da847627ad
Change-Id: Ibef6fdbb24e7f8c46d925089acacefae3074541f
2020-05-21 08:45:51 +00:00
Treehugger Robot
da847627ad Merge "Suppress deprecation warnings in LegacyTypeTrackerTest." am: 8d55b55f60 am: 2911ce534e
Change-Id: I77fdf03484bd0da36ebffd025a33ab4859a0a5a2
2020-05-21 08:31:13 +00:00
Lorenzo Colitti
16b28e2b22 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
Change-Id: I3316d49d42100800740afadc4edf0a13a4d8377c
2020-05-21 17:26:00 +09:00
Treehugger Robot
2911ce534e Merge "Suppress deprecation warnings in LegacyTypeTrackerTest." am: 8d55b55f60
Change-Id: If35be28eac763d01b99078f171da8ff56d90d93f
2020-05-21 08:11:05 +00:00
Treehugger Robot
8d55b55f60 Merge "Suppress deprecation warnings in LegacyTypeTrackerTest." 2020-05-21 07:47:45 +00:00
Chalard Jean
27135676f7 [automerger skipped] Merge "Address nit from aosp/1301317" into rvc-dev am: 9024f27f97 -s ours am: 4a038d3874 -s ours
am skip reason: Change-Id If5e5439b22f05e08a293fd83da4d54f6a4363ca5 with SHA-1 4a7eb2a5d2 is in history

Change-Id: I68df91460ca23d2ec5336543bbedec0b802d80d0
2020-05-21 07:20:46 +00:00
Automerger Merge Worker
6952233711 Merge "[automerger skipped] Merge "Fix a bug where VPNs start out suspended on cellular" into rvc-dev am: 5c721ed487 -s ours am: 447cc67342 -s ours" into rvc-d1-dev-plus-aosp 2020-05-21 07:20:43 +00:00
Chalard Jean
97b7bb0a20 [automerger skipped] Merge "Fix a bug where VPNs start out suspended on cellular" into rvc-dev am: 5c721ed487 -s ours am: 447cc67342 -s ours
am skip reason: Change-Id I3e4ff990c0d4825b21c7679be29a482a2d1324ec with SHA-1 ebbece8b22 is in history

Change-Id: I2c65d4269c9774ee850ebaa0c9ee6bc41c9aec62
2020-05-21 07:20:39 +00:00
Chalard Jean
d8a6d052d8 [automerger skipped] Merge "Address nit from aosp/1301317" into rvc-dev am: 9024f27f97 am: 4d320ee5eb -s ours
am skip reason: Change-Id If5e5439b22f05e08a293fd83da4d54f6a4363ca5 with SHA-1 4f8109f638 is in history

Change-Id: I5ad62604060d15c2e802f612eaea80cd75040ff8
2020-05-21 07:20:23 +00:00
Chalard Jean
94b6cf162a [automerger skipped] Merge "Fix a bug where VPNs start out suspended on cellular" into rvc-dev am: 5c721ed487 am: 6b0c759287 -s ours
am skip reason: Change-Id I3e4ff990c0d4825b21c7679be29a482a2d1324ec with SHA-1 fbd6a2c012 is in history

Change-Id: I9e8f5333444a3eb70d17a3c4077383a8b55815f9
2020-05-21 07:20:05 +00:00
Chalard Jean
538aed929b [automerger skipped] Merge "Fix a bug where a spurious capabilities callback is sent." into rvc-dev am: acdacbfe65 -s ours am: 24967f01d6 -s ours
am skip reason: Change-Id Id7d8bba486bada1a7ba5b0f152d2aa02e407f249 with SHA-1 bee5b3f227 is in history

Change-Id: I2dd1178f403d5515f73b3ae2527576b0dd83d4e8
2020-05-21 07:19:51 +00:00
Chalard Jean
da5f1c9e32 [automerger skipped] Merge "Fix a bug where a spurious capabilities callback is sent." into rvc-dev am: acdacbfe65 am: eaf94d5d0e -s ours
am skip reason: Change-Id Id7d8bba486bada1a7ba5b0f152d2aa02e407f249 with SHA-1 d568791283 is in history

Change-Id: Id070eb419a57aa6c7eddacf8266a40eebdbc415b
2020-05-21 07:19:15 +00:00
Chalard Jean
4d320ee5eb Merge "Address nit from aosp/1301317" into rvc-dev am: 9024f27f97
Change-Id: I719006d1f3452a51303999dad5805ae0271ffddf
2020-05-21 07:04:43 +00:00