Commit Graph

10255 Commits

Author SHA1 Message Date
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
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
a7edba3072 Merge "Test that if an RA sets the same prefix as DNS, nothing happens." am: eafdd034f8 am: fcf8e6a45a am: cc2ab62176 am: 281e5a02ae
Change-Id: I9623d61a26ddfd90c5a37290056fd896a5e77a54
2020-05-24 11:57:23 +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
383f72957f Merge "Forward unknown Data Stall types to Connectivity Diagnostics." am: b10df0da89 am: 8c5375cec3 am: 1dc1ba0bb0 am: 610bb1cab3
Change-Id: I1bf9ca7531d3760f4dce2c9ff502ebf0183b4faf
2020-05-22 00:11:06 +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
086243f1d4 [automerger skipped] Merge "Move Data Stall logic to CS from NetworkMonitorCallbacks." into rvc-dev am: 9b616b851f -s ours am: 0880e7a979 -s ours am: 9576a5d773 -s ours
am skip reason: Change-Id Ie2f6a1a2376c5c452750ab417cb5e8c24fc44fc3 with SHA-1 15eb17c2fc is in history

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

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

Change-Id: I26a3a618cee48f72cebce00c857d5d22caaec864
2020-05-21 16:40:30 +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
5fd9f938ed Merge "Suppress deprecation warnings in LegacyTypeTrackerTest." am: 8d55b55f60 am: 2911ce534e am: da847627ad am: f445b655f6
Change-Id: Icd04bee9c06f7e3ac00622592945fb5d3660c4cf
2020-05-21 09:01:21 +00: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
Chalard Jean
78760ef98e [automerger skipped] Merge "Address nit from aosp/1301317" into rvc-dev am: 9024f27f97 -s ours am: 4a038d3874 -s ours am: 27135676f7 -s ours
am skip reason: Change-Id If5e5439b22f05e08a293fd83da4d54f6a4363ca5 with SHA-1 4a7eb2a5d2 is in history

Change-Id: If7bac76f0d8a27712113636ffc5f65649e055db9
2020-05-21 07:55:43 +00:00
Automerger Merge Worker
5022dcf852 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 am: 6952233711 -s ours
am skip reason: Change-Id I3e4ff990c0d4825b21c7679be29a482a2d1324ec with SHA-1 ebbece8b22 is in history

Change-Id: I3bff6558c9b3d329fd36fe9932d1993961b6e0d0
2020-05-21 07:55:36 +00:00
Automerger Merge Worker
49a1ecef8f Merge "[automerger skipped] Merge "Address nit from aosp/1301317" into rvc-dev am: 9024f27f97 am: 4d320ee5eb -s ours" into rvc-d1-dev-plus-aosp am: 6d1ff7dc30 -s ours
am skip reason: Change-Id If5e5439b22f05e08a293fd83da4d54f6a4363ca5 with SHA-1 4a7eb2a5d2 is in history

Change-Id: I70402726f2a529d89538d4d8169ac2eba4918dc3
2020-05-21 07:55:04 +00:00
Treehugger Robot
8d55b55f60 Merge "Suppress deprecation warnings in LegacyTypeTrackerTest." 2020-05-21 07:47:45 +00:00
Chalard Jean
75ae5b41a3 [automerger skipped] Merge "Fix a bug where VPNs start out suspended on cellular" into rvc-dev am: 5c721ed487 am: 6b0c759287 -s ours am: 94b6cf162a -s ours
am skip reason: Change-Id I3e4ff990c0d4825b21c7679be29a482a2d1324ec with SHA-1 ebbece8b22 is in history

Change-Id: I119242b4e1657e198f93d2e768aea3906dbfffad
2020-05-21 07:36:24 +00:00
Chalard Jean
12f03f87d2 [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: 538aed929b -s ours
am skip reason: Change-Id Id7d8bba486bada1a7ba5b0f152d2aa02e407f249 with SHA-1 bee5b3f227 is in history

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

Change-Id: Iea04465f5b85e642324222d9e2fa8152a9f213ba
2020-05-21 07:35:58 +00:00
Automerger Merge Worker
c0ca1e2503 Merge "[automerger skipped] Merge "Fix a bug where a spurious capabilities callback is sent." into rvc-dev am: acdacbfe65 am: eaf94d5d0e -s ours am: da5f1c9e32 -s ours" into rvc-qpr-dev-plus-aosp 2020-05-21 07:35:53 +00:00
Chalard Jean
33f8db02d7 [automerger skipped] Merge "Fix a bug where a spurious capabilities callback is sent." into rvc-dev am: acdacbfe65 am: eaf94d5d0e -s ours am: da5f1c9e32 -s ours
am skip reason: Change-Id Id7d8bba486bada1a7ba5b0f152d2aa02e407f249 with SHA-1 bee5b3f227 is in history

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

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

Change-Id: I4c1667bda67f3c8cf19c5407963e2a28e0443ece
2020-05-21 07:35:15 +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
Chalard Jean
4a038d3874 [automerger skipped] Merge "Address nit from aosp/1301317" into rvc-dev am: 9024f27f97 -s ours
am skip reason: Change-Id If5e5439b22f05e08a293fd83da4d54f6a4363ca5 with SHA-1 4f8109f638 is in history

Change-Id: Ifaf50fb9e04b1403cc75d9002e46c6955e111a40
2020-05-21 07:04:30 +00:00
Chalard Jean
447cc67342 [automerger skipped] Merge "Fix a bug where VPNs start out suspended on cellular" into rvc-dev am: 5c721ed487 -s ours
am skip reason: Change-Id I3e4ff990c0d4825b21c7679be29a482a2d1324ec with SHA-1 fbd6a2c012 is in history

Change-Id: I22ecee256894e850f85ab02b299136283ebe9a08
2020-05-21 07:03:53 +00:00