Commit Graph

10262 Commits

Author SHA1 Message Date
Lorenzo Colitti
c6d2637ae2 [automerger skipped] Test that if an RA sets the same prefix as DNS, nothing happens. am: 3e54957fac -s ours am: 19d45f3b0f -s ours am: faa2504ff0 -s ours
am skip reason: Change-Id I3316d49d42100800740afadc4edf0a13a4d8377c with SHA-1 3e54957fac is in history

Change-Id: I2cc0163b25e772786b9c64dca9d354bc4d66044c
2020-05-26 13:23:01 +00:00
Lorenzo Colitti
e4d37aa2fa [automerger skipped] Test that if an RA sets the same prefix as DNS, nothing happens. am: 3e54957fac am: 71c4318efd -s ours am: 65a195ba40 -s ours
am skip reason: Change-Id I3316d49d42100800740afadc4edf0a13a4d8377c with SHA-1 2a0ef00bb9 is in history

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

Change-Id: Icb5f3ccb42469f84770a9a4b8a1dc990c67a9376
2020-05-26 13:10:39 +00:00
Lorenzo Colitti
65a195ba40 [automerger skipped] Test that if an RA sets the same prefix as DNS, nothing happens. am: 3e54957fac am: 71c4318efd -s ours
am skip reason: Change-Id I3316d49d42100800740afadc4edf0a13a4d8377c with SHA-1 2a0ef00bb9 is in history

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

Change-Id: I3e050057ba6ac95d789ed7f34f390bec586d84b7
2020-05-26 12:58:24 +00:00
Lorenzo Colitti
71c4318efd Test that if an RA sets the same prefix as DNS, nothing happens. am: 3e54957fac
Change-Id: I171ff7fd8140028dc4a4e7df5cc4663b8ad696e7
2020-05-26 12:58:22 +00:00
Lorenzo Colitti
3e54957fac 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
29d3636dd4 Merge "Inform the DNS resolver when it needs to do DNS64 synthesis." am: eed51faa49 am: f5a5cd3bd7 am: d0cf1afac5 am: cff8146b4d
Change-Id: I717046592a6535d39b8def912c7b78a071ae5a99
2020-05-26 10:46:22 +00:00
Lorenzo Colitti
cff8146b4d Merge "Inform the DNS resolver when it needs to do DNS64 synthesis." am: eed51faa49 am: f5a5cd3bd7 am: d0cf1afac5
Change-Id: I38aa313a3e0b8c9f7a401f1a56f808e5fe723525
2020-05-26 10:28:04 +00:00
Lorenzo Colitti
d0cf1afac5 Merge "Inform the DNS resolver when it needs to do DNS64 synthesis." am: eed51faa49 am: f5a5cd3bd7
Change-Id: I06278ddff31d8c0dbb4ce6cfded01a38369d8a3c
2020-05-26 10:13:17 +00:00
Lorenzo Colitti
f5a5cd3bd7 Merge "Inform the DNS resolver when it needs to do DNS64 synthesis." am: eed51faa49
Change-Id: Ia18f83bd6a22f255bf17792ebc14e485810a39cd
2020-05-26 09:49:13 +00:00
Lorenzo Colitti
eed51faa49 Merge "Inform the DNS resolver when it needs to do DNS64 synthesis." 2020-05-26 09:26:46 +00:00
Lorenzo Colitti
ccc05a0bc8 Merge "Test that if an RA sets the same prefix as DNS, nothing happens." am: 82db920da4 am: 6d866bcd5f am: 352e8c2aa5 am: 7a35f41cf7
Change-Id: I9623d61a26ddfd90c5a37290056fd896a5e77a54
2020-05-24 11:57:23 +00:00
Lorenzo Colitti
7a35f41cf7 Merge "Test that if an RA sets the same prefix as DNS, nothing happens." am: 82db920da4 am: 6d866bcd5f am: 352e8c2aa5
Change-Id: I5bbb8e5adb2fb2a961fcc64b7952204bb1bb3b0d
2020-05-24 11:43:14 +00:00
Lorenzo Colitti
352e8c2aa5 Merge "Test that if an RA sets the same prefix as DNS, nothing happens." am: 82db920da4 am: 6d866bcd5f
Change-Id: Ib2eb07e3794630cc636759ce6a6529b7b56a3cfe
2020-05-24 11:30:55 +00:00
Lorenzo Colitti
6d866bcd5f Merge "Test that if an RA sets the same prefix as DNS, nothing happens." am: 82db920da4
Change-Id: I61f7ad698fb5b086f5e284309a21f56314d8163f
2020-05-24 11:17:02 +00:00
Lorenzo Colitti
82db920da4 Merge "Test that if an RA sets the same prefix as DNS, nothing happens." 2020-05-24 10:59:40 +00:00
Cody Kesting
4f36f41ca2 Merge "Forward unknown Data Stall types to Connectivity Diagnostics." am: c8e843e844 am: fe8cda4daf am: ab63079e61 am: 782a085f7d
Change-Id: I1bf9ca7531d3760f4dce2c9ff502ebf0183b4faf
2020-05-22 00:11:06 +00:00
Cody Kesting
782a085f7d Merge "Forward unknown Data Stall types to Connectivity Diagnostics." am: c8e843e844 am: fe8cda4daf am: ab63079e61
Change-Id: I33a89a56431f168f7bfeb72e2eabef9010685940
2020-05-21 23:50:03 +00:00
Cody Kesting
ab63079e61 Merge "Forward unknown Data Stall types to Connectivity Diagnostics." am: c8e843e844 am: fe8cda4daf
Change-Id: I31d17c5c353e822f3d48166ffe9cc39abd31c198
2020-05-21 23:35:38 +00:00
Cody Kesting
fe8cda4daf Merge "Forward unknown Data Stall types to Connectivity Diagnostics." am: c8e843e844
Change-Id: Ifc49eb81c219d1ba036c11887e2bc686a68dd67d
2020-05-21 23:19:30 +00:00
Cody Kesting
c8e843e844 Merge "Forward unknown Data Stall types to Connectivity Diagnostics." 2020-05-21 22:58:29 +00:00
Cody Kesting
5228100ca1 [automerger skipped] Merge "Move Data Stall logic to CS from NetworkMonitorCallbacks." into rvc-dev am: 8d1db61752 -s ours am: 160830b8e7 -s ours am: 49f2af5440 -s ours
am skip reason: Change-Id Ie2f6a1a2376c5c452750ab417cb5e8c24fc44fc3 with SHA-1 7e4528c080 is in history

Change-Id: Id0ac2a40f9e48c52ae1b488f89e408f586a34581
2020-05-21 16:56:02 +00:00
Cody Kesting
233bf14744 [automerger skipped] Merge "Move Data Stall logic to CS from NetworkMonitorCallbacks." into rvc-dev am: 8d1db61752 am: 4722e8dfa7 -s ours am: dd7f420cfe -s ours
am skip reason: Change-Id Ie2f6a1a2376c5c452750ab417cb5e8c24fc44fc3 with SHA-1 7e4528c080 is in history

Change-Id: I4d04b37417b0cd04416666b27e7172134893db1e
2020-05-21 16:54:20 +00:00
Cody Kesting
10d33eb1fd [automerger skipped] Merge "Move Data Stall logic to CS from NetworkMonitorCallbacks." into rvc-dev am: 8d1db61752 am: 4722e8dfa7 am: ce1bad194a -s ours
am skip reason: Change-Id Ie2f6a1a2376c5c452750ab417cb5e8c24fc44fc3 with SHA-1 6784cf6966 is in history

Change-Id: I26a3a618cee48f72cebce00c857d5d22caaec864
2020-05-21 16:40:30 +00:00
Cody Kesting
49f2af5440 [automerger skipped] Merge "Move Data Stall logic to CS from NetworkMonitorCallbacks." into rvc-dev am: 8d1db61752 -s ours am: 160830b8e7 -s ours
am skip reason: Change-Id Ie2f6a1a2376c5c452750ab417cb5e8c24fc44fc3 with SHA-1 7e4528c080 is in history

Change-Id: Ibeb7ba515d11c4dcf74b0d8f504adeff007ff444
2020-05-21 16:25:23 +00:00
Cody Kesting
dd7f420cfe [automerger skipped] Merge "Move Data Stall logic to CS from NetworkMonitorCallbacks." into rvc-dev am: 8d1db61752 am: 4722e8dfa7 -s ours
am skip reason: Change-Id Ie2f6a1a2376c5c452750ab417cb5e8c24fc44fc3 with SHA-1 6784cf6966 is in history

Change-Id: I3f89d4dd79935d26629dbd06c06f2784ded317e8
2020-05-21 16:24:02 +00:00
Cody Kesting
4722e8dfa7 Merge "Move Data Stall logic to CS from NetworkMonitorCallbacks." into rvc-dev am: 8d1db61752
Change-Id: I75c162680fa548da20a8ab3dcf664dd57feb9002
2020-05-21 16:04:19 +00:00
Cody Kesting
160830b8e7 [automerger skipped] Merge "Move Data Stall logic to CS from NetworkMonitorCallbacks." into rvc-dev am: 8d1db61752 -s ours
am skip reason: Change-Id Ie2f6a1a2376c5c452750ab417cb5e8c24fc44fc3 with SHA-1 6784cf6966 is in history

Change-Id: I376f8021b63cc21393de7eba8f0ad26650eedab5
2020-05-21 16:04:17 +00:00
Cody Kesting
8d1db61752 Merge "Move Data Stall logic to CS from NetworkMonitorCallbacks." into rvc-dev 2020-05-21 16:01:01 +00:00
Lorenzo Colitti
f28b6b705c 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
978aa17285 Merge "Suppress deprecation warnings in LegacyTypeTrackerTest." am: 585dc0665e am: 212e497cbc am: 4ca97a469c am: c1a0fffef6
Change-Id: Icd04bee9c06f7e3ac00622592945fb5d3660c4cf
2020-05-21 09:01:21 +00:00
Treehugger Robot
c1a0fffef6 Merge "Suppress deprecation warnings in LegacyTypeTrackerTest." am: 585dc0665e am: 212e497cbc am: 4ca97a469c
Change-Id: Ibef6fdbb24e7f8c46d925089acacefae3074541f
2020-05-21 08:45:51 +00:00
Treehugger Robot
4ca97a469c Merge "Suppress deprecation warnings in LegacyTypeTrackerTest." am: 585dc0665e am: 212e497cbc
Change-Id: I77fdf03484bd0da36ebffd025a33ab4859a0a5a2
2020-05-21 08:31:13 +00:00
Lorenzo Colitti
2a0ef00bb9 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
212e497cbc Merge "Suppress deprecation warnings in LegacyTypeTrackerTest." am: 585dc0665e
Change-Id: If35be28eac763d01b99078f171da8ff56d90d93f
2020-05-21 08:11:05 +00:00
Chalard Jean
90eff958fb [automerger skipped] Merge "Address nit from aosp/1301317" into rvc-dev am: 75fddad9b4 -s ours am: fe2c8cf87c -s ours am: 06449a4bfe -s ours
am skip reason: Change-Id If5e5439b22f05e08a293fd83da4d54f6a4363ca5 with SHA-1 436608cf39 is in history

Change-Id: If7bac76f0d8a27712113636ffc5f65649e055db9
2020-05-21 07:55:43 +00:00
Automerger Merge Worker
632980c25e Merge "[automerger skipped] Merge "Fix a bug where VPNs start out suspended on cellular" into rvc-dev am: 8c06a845ac -s ours am: 3743eca9f2 -s ours" into rvc-d1-dev-plus-aosp am: c00f8130ff -s ours
am skip reason: Change-Id I3e4ff990c0d4825b21c7679be29a482a2d1324ec with SHA-1 fc7054d0e9 is in history

Change-Id: I3bff6558c9b3d329fd36fe9932d1993961b6e0d0
2020-05-21 07:55:36 +00:00
Automerger Merge Worker
14935b8fc6 Merge "[automerger skipped] Merge "Address nit from aosp/1301317" into rvc-dev am: 75fddad9b4 am: 07b69e4658 -s ours" into rvc-d1-dev-plus-aosp am: 6d1ff7dc30 -s ours
am skip reason: Change-Id If5e5439b22f05e08a293fd83da4d54f6a4363ca5 with SHA-1 436608cf39 is in history

Change-Id: I70402726f2a529d89538d4d8169ac2eba4918dc3
2020-05-21 07:55:04 +00:00
Treehugger Robot
585dc0665e Merge "Suppress deprecation warnings in LegacyTypeTrackerTest." 2020-05-21 07:47:45 +00:00
Chalard Jean
f27c3ce2aa [automerger skipped] Merge "Fix a bug where VPNs start out suspended on cellular" into rvc-dev am: 8c06a845ac am: e3d1f5e2f1 -s ours am: 7823ca41be -s ours
am skip reason: Change-Id I3e4ff990c0d4825b21c7679be29a482a2d1324ec with SHA-1 fc7054d0e9 is in history

Change-Id: I119242b4e1657e198f93d2e768aea3906dbfffad
2020-05-21 07:36:24 +00:00
Chalard Jean
13b822c460 [automerger skipped] Merge "Fix a bug where a spurious capabilities callback is sent." into rvc-dev am: acdacbfe65 -s ours am: cb21e90728 -s ours am: 3d11d87b2a -s ours
am skip reason: Change-Id Id7d8bba486bada1a7ba5b0f152d2aa02e407f249 with SHA-1 1112dd3d83 is in history

Change-Id: I0e71e662b1e27538905daa0a1718185b6dfccb3f
2020-05-21 07:36:07 +00:00
Chalard Jean
94b0dab36d [automerger skipped] Merge "Address nit from aosp/1301317" into rvc-dev am: 75fddad9b4 am: 07b69e4658 am: 4401e112ee -s ours
am skip reason: Change-Id If5e5439b22f05e08a293fd83da4d54f6a4363ca5 with SHA-1 1f9e9ce3d5 is in history

Change-Id: Iea04465f5b85e642324222d9e2fa8152a9f213ba
2020-05-21 07:35:58 +00:00
Automerger Merge Worker
73b16cbd77 Merge "[automerger skipped] Merge "Fix a bug where a spurious capabilities callback is sent." into rvc-dev am: acdacbfe65 am: dceccdfc1c -s ours am: ceb3aa8295 -s ours" into rvc-qpr-dev-plus-aosp 2020-05-21 07:35:53 +00:00
Chalard Jean
9a1dd02f14 [automerger skipped] Merge "Fix a bug where a spurious capabilities callback is sent." into rvc-dev am: acdacbfe65 am: dceccdfc1c -s ours am: ceb3aa8295 -s ours
am skip reason: Change-Id Id7d8bba486bada1a7ba5b0f152d2aa02e407f249 with SHA-1 1112dd3d83 is in history

Change-Id: I6366c3d76e0a5f61fa90eb93d8ed2323f87e8504
2020-05-21 07:35:47 +00:00
Chalard Jean
9fc4f5297d [automerger skipped] Merge "Fix a bug where VPNs start out suspended on cellular" into rvc-dev am: 8c06a845ac am: e3d1f5e2f1 am: a8caf45e3b -s ours
am skip reason: Change-Id I3e4ff990c0d4825b21c7679be29a482a2d1324ec with SHA-1 91a1beddcc is in history

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

Change-Id: I4c1667bda67f3c8cf19c5407963e2a28e0443ece
2020-05-21 07:35:15 +00:00
Chalard Jean
06449a4bfe [automerger skipped] Merge "Address nit from aosp/1301317" into rvc-dev am: 75fddad9b4 -s ours am: fe2c8cf87c -s ours
am skip reason: Change-Id If5e5439b22f05e08a293fd83da4d54f6a4363ca5 with SHA-1 436608cf39 is in history

Change-Id: I68df91460ca23d2ec5336543bbedec0b802d80d0
2020-05-21 07:20:46 +00:00
Automerger Merge Worker
c00f8130ff Merge "[automerger skipped] Merge "Fix a bug where VPNs start out suspended on cellular" into rvc-dev am: 8c06a845ac -s ours am: 3743eca9f2 -s ours" into rvc-d1-dev-plus-aosp 2020-05-21 07:20:43 +00:00
Chalard Jean
89f804c1cf [automerger skipped] Merge "Fix a bug where VPNs start out suspended on cellular" into rvc-dev am: 8c06a845ac -s ours am: 3743eca9f2 -s ours
am skip reason: Change-Id I3e4ff990c0d4825b21c7679be29a482a2d1324ec with SHA-1 fc7054d0e9 is in history

Change-Id: I2c65d4269c9774ee850ebaa0c9ee6bc41c9aec62
2020-05-21 07:20:39 +00:00