Commit Graph

10133 Commits

Author SHA1 Message Date
Lorenzo Colitti
0b009c54bf Merge "Support changing the NAT64 prefix without removing it." am: fa6b37b1e0 am: a3004f7d2f am: 18b08e6bd0 am: b2023231f8 am: d119f4a9c1
Change-Id: I22a4393f70b545dd7b9588bdb674f0684d73e45c
2020-04-16 17:19:35 +00:00
Lorenzo Colitti
d119f4a9c1 Merge "Support changing the NAT64 prefix without removing it." am: fa6b37b1e0 am: a3004f7d2f am: 18b08e6bd0 am: b2023231f8
Change-Id: Ic82307541b72ea8efa470d13c086016abafe4d9a
2020-04-16 17:08:20 +00:00
Lorenzo Colitti
b2023231f8 Merge "Support changing the NAT64 prefix without removing it." am: fa6b37b1e0 am: a3004f7d2f am: 18b08e6bd0
Change-Id: I61c2f5c46e4e968ab1777432042b615186829cba
2020-04-16 16:56:20 +00:00
Lorenzo Colitti
18b08e6bd0 Merge "Support changing the NAT64 prefix without removing it." am: fa6b37b1e0 am: a3004f7d2f
Change-Id: I19050527eb41a58c7844972f34e92719d2344c27
2020-04-16 16:49:33 +00:00
Lorenzo Colitti
a3004f7d2f Merge "Support changing the NAT64 prefix without removing it." am: fa6b37b1e0
Change-Id: I2616aba51bdad9afa2dddf6011355f14e4b5457e
2020-04-16 16:37:08 +00:00
Lorenzo Colitti
fa6b37b1e0 Merge "Support changing the NAT64 prefix without removing it." 2020-04-16 16:24:57 +00:00
Junyu Lai
97b93981e7 [automerger skipped] Merge "[SM10] Adopt helper class to monitor RAT type change per sub" into rvc-dev am: e63d990bb4 am: 8a4693e56c -s ours am: d9884144ca -s ours am: c055fc3cdb -s ours
am skip reason: Change-Id I45c3aa9046b316c8cd0943543d620a22e4afefd1 with SHA-1 b55cb0a7d0 is in history

Change-Id: I286546740d259790e5153d8e9c565762fd46dda1
2020-04-16 00:18:43 +00:00
Junyu Lai
588da3d18a [automerger skipped] Merge "[SM10] Adopt helper class to monitor RAT type change per sub" into rvc-dev am: e63d990bb4 am: ce5c0b74c5 am: e382873224 -s ours am: f0b0ca28e7 -s ours
am skip reason: Change-Id I45c3aa9046b316c8cd0943543d620a22e4afefd1 with SHA-1 b55cb0a7d0 is in history

Change-Id: I65040c118cde06339e9b221c557b314d205aa60e
2020-04-16 00:07:07 +00:00
Junyu Lai
9684e28e61 Merge "[SP27.3] Rename TestableNetworkStatsProvider" into rvc-dev am: 6d1c9246fb am: a48e0b2acb am: fc3756edcf am: a9f44b56f4
Change-Id: Ia70ccf7fe8bb7b44640db59ad00d5150af546f0e
2020-04-16 00:05:35 +00:00
Automerger Merge Worker
6b138f6aae Merge "Merge "[SP27.3] Rename TestableNetworkStatsProvider" into rvc-dev am: 6d1c9246fb am: 4c4e75324a" into rvc-d1-dev-plus-aosp am: 2674aa108b am: 6f8d03fdd9
Change-Id: I4c047ce968b7f701f3bc718511b969d4b7d7e84c
2020-04-16 00:05:16 +00:00
Junyu Lai
7fccaedcdb [automerger skipped] Merge "[SM10] Adopt helper class to monitor RAT type change per sub" into rvc-dev am: e63d990bb4 am: ce5c0b74c5 am: edd5229bb5 am: b3e4446eb3 am: fa228a0156 -s ours
am skip reason: Change-Id I45c3aa9046b316c8cd0943543d620a22e4afefd1 with SHA-1 9f2e38da19 is in history

Change-Id: I019d6fa102815a24711aea617a51aca2364b6a6d
2020-04-15 23:54:55 +00:00
Junyu Lai
35266e7f65 Merge "[SP27.3] Rename TestableNetworkStatsProvider" into rvc-dev am: 6d1c9246fb am: 4c4e75324a am: 0bce5338ac am: 6afc29bd6f am: 37f08a3ef0
Change-Id: Iefc604fe82b124ef5bfe8b4651456a2fa7813e08
2020-04-15 23:53:28 +00:00
Junyu Lai
c055fc3cdb [automerger skipped] Merge "[SM10] Adopt helper class to monitor RAT type change per sub" into rvc-dev am: e63d990bb4 am: 8a4693e56c -s ours am: d9884144ca -s ours
am skip reason: Change-Id I45c3aa9046b316c8cd0943543d620a22e4afefd1 with SHA-1 b55cb0a7d0 is in history

Change-Id: I8af177e7714eeed230a0781016e240ebce6e95eb
2020-04-15 19:13:47 +00:00
Junyu Lai
f0b0ca28e7 [automerger skipped] Merge "[SM10] Adopt helper class to monitor RAT type change per sub" into rvc-dev am: e63d990bb4 am: ce5c0b74c5 am: e382873224 -s ours
am skip reason: Change-Id I45c3aa9046b316c8cd0943543d620a22e4afefd1 with SHA-1 b55cb0a7d0 is in history

Change-Id: Iac21e8421c0de2ef41edd1ac82488c352029631a
2020-04-15 19:00:17 +00:00
Junyu Lai
a9f44b56f4 Merge "[SP27.3] Rename TestableNetworkStatsProvider" into rvc-dev am: 6d1c9246fb am: a48e0b2acb am: fc3756edcf
Change-Id: Icf88c06793586dd4cb04f65d24cc9792953ee8d5
2020-04-15 18:58:04 +00:00
Automerger Merge Worker
6f8d03fdd9 Merge "Merge "[SP27.3] Rename TestableNetworkStatsProvider" into rvc-dev am: 6d1c9246fb am: 4c4e75324a" into rvc-d1-dev-plus-aosp am: 2674aa108b
Change-Id: I852222487a3e8552e6cde374af718dcd1975618a
2020-04-15 18:57:42 +00:00
Junyu Lai
fa228a0156 Merge "[SM10] Adopt helper class to monitor RAT type change per sub" into rvc-dev am: e63d990bb4 am: ce5c0b74c5 am: edd5229bb5 am: b3e4446eb3
Change-Id: I8c4e71f3d64b6cea509d5e8654ed919fcf7d4108
2020-04-15 18:49:11 +00:00
Junyu Lai
37f08a3ef0 Merge "[SP27.3] Rename TestableNetworkStatsProvider" into rvc-dev am: 6d1c9246fb am: 4c4e75324a am: 0bce5338ac am: 6afc29bd6f
Change-Id: I084adb9cdbe2093bb2f94e7b5f75048496b63d7f
2020-04-15 18:48:03 +00:00
Junyu Lai
d9884144ca [automerger skipped] Merge "[SM10] Adopt helper class to monitor RAT type change per sub" into rvc-dev am: e63d990bb4 am: 8a4693e56c -s ours
am skip reason: Change-Id I45c3aa9046b316c8cd0943543d620a22e4afefd1 with SHA-1 b55cb0a7d0 is in history

Change-Id: Idade28f3ca80b48d8d56d3584cbf195c2f250c40
2020-04-15 17:58:23 +00:00
Junyu Lai
e382873224 Merge "[SM10] Adopt helper class to monitor RAT type change per sub" into rvc-dev am: e63d990bb4 am: ce5c0b74c5
Change-Id: I883b3b8d699bda1b640992b621b547048f057807
2020-04-15 17:48:41 +00:00
Junyu Lai
fc3756edcf Merge "[SP27.3] Rename TestableNetworkStatsProvider" into rvc-dev am: 6d1c9246fb am: a48e0b2acb
Change-Id: I06ac6c1a3090a3ac52270f92e7d717ef8107af98
2020-04-15 17:47:59 +00:00
Junyu Lai
6e11dde9ac Merge "[SP27.3] Rename TestableNetworkStatsProvider" into rvc-dev am: 6d1c9246fb am: 4c4e75324a
Change-Id: I04a4ebcc5ef0ece209722a27b91c46f8c483bda0
2020-04-15 17:47:51 +00:00
Junyu Lai
8a4693e56c Merge "[SM10] Adopt helper class to monitor RAT type change per sub" into rvc-dev am: e63d990bb4
Change-Id: I5dd2e734cd8ce6637c39e57a6b302447bc0f295f
2020-04-15 17:26:19 +00:00
Junyu Lai
ce5c0b74c5 Merge "[SM10] Adopt helper class to monitor RAT type change per sub" into rvc-dev am: e63d990bb4
Change-Id: I6cfb8d5a6d1306200d63afa6770df89472bd2f81
2020-04-15 17:26:05 +00:00
Junyu Lai
4c4e75324a Merge "[SP27.3] Rename TestableNetworkStatsProvider" into rvc-dev am: 6d1c9246fb
Change-Id: I5f1820bc4487bea25b75e1b82365d6833372b0c3
2020-04-15 17:25:21 +00:00
Junyu Lai
a48e0b2acb Merge "[SP27.3] Rename TestableNetworkStatsProvider" into rvc-dev am: 6d1c9246fb
Change-Id: Ice8c64d926e026ebc9d993330a84d57007782a99
2020-04-15 17:24:41 +00:00
Lorenzo Colitti
b3e329c4b3 Support changing the NAT64 prefix without removing it.
This cannot (currently) happen with DNS64 detection, but it can
happen with the PREF64 option.

Bug: 150648313
Test: atest ConnectivityServiceTest Nat464XlatTest --rerun-until-failure 100
Change-Id: I789fe9d46d3ac5d074ae697d23013f24a9e0246d
2020-04-16 00:07:30 +09:00
Junyu Lai
e63d990bb4 Merge "[SM10] Adopt helper class to monitor RAT type change per sub" into rvc-dev 2020-04-15 11:49:01 +00:00
Junyu Lai
6d1c9246fb Merge "[SP27.3] Rename TestableNetworkStatsProvider" into rvc-dev 2020-04-15 10:44:23 +00:00
junyulai
b55cb0a7d0 [SM10] Adopt helper class to monitor RAT type change per sub
Test: atest NetworkStatsServiceTest
Bug: 146415925
Change-Id: I45c3aa9046b316c8cd0943543d620a22e4afefd1
Merged-In: I45c3aa9046b316c8cd0943543d620a22e4afefd1
(cherry picked from commit 219faff07bdc58c14fe58fc525e86383db1f8167)
2020-04-15 10:30:49 +00:00
Junyu Lai
1f01dd061f Merge "[SM10] Adopt helper class to monitor RAT type change per sub" 2020-04-15 10:29:21 +00:00
Chalard Jean
4249ae030d [automerger skipped] Merge "Add instrumentation to test NetworkAgent." into rvc-dev am: 14fc421e23 -s ours am: 5970a995af -s ours am: f9377000a7 -s ours am: 04ef6cd3c0 -s ours
am skip reason: Change-Id Ia83b1c896df63bb18e2aa4b74d6cc09eba990eb5 with SHA-1 2116068514 is in history

Change-Id: Icec1d01596573e5608dafe06ae568f085bade62b
2020-04-14 06:11:19 +00:00
Chalard Jean
d451909272 [automerger skipped] Merge "Add instrumentation to test NetworkAgent." into rvc-dev am: 14fc421e23 am: 82019a6b18 -s ours am: 8add6d7d3e -s ours am: f72ed720ed -s ours
am skip reason: Change-Id Ia83b1c896df63bb18e2aa4b74d6cc09eba990eb5 with SHA-1 2116068514 is in history

Change-Id: I4c7ba4fbdedeeb07910e7fa7022a33288a4a42d3
2020-04-14 06:10:45 +00:00
Chalard Jean
04ef6cd3c0 [automerger skipped] Merge "Add instrumentation to test NetworkAgent." into rvc-dev am: 14fc421e23 -s ours am: 5970a995af -s ours am: f9377000a7 -s ours
am skip reason: Change-Id Ia83b1c896df63bb18e2aa4b74d6cc09eba990eb5 with SHA-1 2116068514 is in history

Change-Id: Ifb1fa26414b5c5b1f15b28e9d67b8ca3e4b69e2d
2020-04-14 05:51:22 +00:00
Chalard Jean
f72ed720ed [automerger skipped] Merge "Add instrumentation to test NetworkAgent." into rvc-dev am: 14fc421e23 am: 82019a6b18 -s ours am: 8add6d7d3e -s ours
am skip reason: Change-Id Ia83b1c896df63bb18e2aa4b74d6cc09eba990eb5 with SHA-1 2116068514 is in history

Change-Id: I24c59bdca833863af7f888f37a39344128d4a616
2020-04-14 05:50:59 +00:00
Chalard Jean
f9377000a7 [automerger skipped] Merge "Add instrumentation to test NetworkAgent." into rvc-dev am: 14fc421e23 -s ours am: 5970a995af -s ours
am skip reason: Change-Id Ia83b1c896df63bb18e2aa4b74d6cc09eba990eb5 with SHA-1 2116068514 is in history

Change-Id: If6ce5315f3666418eb808303ff85d9e87a1246f1
2020-04-14 05:30:44 +00:00
Chalard Jean
8add6d7d3e [automerger skipped] Merge "Add instrumentation to test NetworkAgent." into rvc-dev am: 14fc421e23 am: 82019a6b18 -s ours
am skip reason: Change-Id Ia83b1c896df63bb18e2aa4b74d6cc09eba990eb5 with SHA-1 2116068514 is in history

Change-Id: I49b5366cdbde0667f07da64a5bba740a54e1e0b2
2020-04-14 05:29:20 +00:00
Chalard Jean
5970a995af [automerger skipped] Merge "Add instrumentation to test NetworkAgent." into rvc-dev am: 14fc421e23 -s ours
am skip reason: Change-Id Ia83b1c896df63bb18e2aa4b74d6cc09eba990eb5 with SHA-1 2116068514 is in history

Change-Id: I92c0c3da037eabed28f78c09ffad80074602dd5f
2020-04-14 05:13:38 +00:00
Chalard Jean
82019a6b18 Merge "Add instrumentation to test NetworkAgent." into rvc-dev am: 14fc421e23
Change-Id: Iadbfaa4dff8effc6c7ece6fd6f3af1a1dc58b7c0
2020-04-14 05:12:48 +00:00
Chalard Jean
14fc421e23 Merge "Add instrumentation to test NetworkAgent." into rvc-dev 2020-04-14 04:54:33 +00:00
Chalard Jean
1eaf298656 [automerger skipped] Merge "Allow testing of signal strength" into rvc-dev am: 4947356664 am: bca0babd92 -s ours am: 70d1decc19 -s ours am: d3bdebdda8 -s ours
am skip reason: Change-Id I2b4b89be3e69f4853fd6978d2c8f5c8eb4271f21 with SHA-1 cbc7c5b171 is in history

Change-Id: I16c2c4d932bc2e9be5b5bcb8b8fc5ca44761387b
2020-04-14 03:30:29 +00:00
Chalard Jean
b6d6b006c7 [automerger skipped] Merge "Allow testing of signal strength" into rvc-dev am: 4947356664 -s ours am: 5f8afc1e8e -s ours am: 047b281e6a -s ours am: 60a5086e4a -s ours
am skip reason: Change-Id I2b4b89be3e69f4853fd6978d2c8f5c8eb4271f21 with SHA-1 cbc7c5b171 is in history

Change-Id: If7351b4a10ad73c9374732236ac14992602e529d
2020-04-14 03:29:18 +00:00
Chalard Jean
d3bdebdda8 [automerger skipped] Merge "Allow testing of signal strength" into rvc-dev am: 4947356664 am: bca0babd92 -s ours am: 70d1decc19 -s ours
am skip reason: Change-Id I2b4b89be3e69f4853fd6978d2c8f5c8eb4271f21 with SHA-1 cbc7c5b171 is in history

Change-Id: I8d942691d1032e6567407b19c72d194274d38c5b
2020-04-14 03:07:24 +00:00
Chalard Jean
60a5086e4a [automerger skipped] Merge "Allow testing of signal strength" into rvc-dev am: 4947356664 -s ours am: 5f8afc1e8e -s ours am: 047b281e6a -s ours
am skip reason: Change-Id I2b4b89be3e69f4853fd6978d2c8f5c8eb4271f21 with SHA-1 cbc7c5b171 is in history

Change-Id: Icaa6bfc0f875883e036d4586a5f48165561583db
2020-04-14 03:06:22 +00:00
Chalard Jean
70d1decc19 [automerger skipped] Merge "Allow testing of signal strength" into rvc-dev am: 4947356664 am: bca0babd92 -s ours
am skip reason: Change-Id I2b4b89be3e69f4853fd6978d2c8f5c8eb4271f21 with SHA-1 cbc7c5b171 is in history

Change-Id: Id16481c143b1aa83ca3e9b76fc5245e97b0f4ed8
2020-04-14 03:05:43 +00:00
Chalard Jean
047b281e6a [automerger skipped] Merge "Allow testing of signal strength" into rvc-dev am: 4947356664 -s ours am: 5f8afc1e8e -s ours
am skip reason: Change-Id I2b4b89be3e69f4853fd6978d2c8f5c8eb4271f21 with SHA-1 cbc7c5b171 is in history

Change-Id: Ieb35cdd53ec97d44bee3e39d77232b1a5afbacda
2020-04-14 02:53:25 +00:00
Chalard Jean
bca0babd92 Merge "Allow testing of signal strength" into rvc-dev am: 4947356664
Change-Id: If926a556bfe9e016254d427a78fa6061e9d2d6e0
2020-04-14 02:52:03 +00:00
Chalard Jean
5f8afc1e8e [automerger skipped] Merge "Allow testing of signal strength" into rvc-dev am: 4947356664 -s ours
am skip reason: Change-Id I2b4b89be3e69f4853fd6978d2c8f5c8eb4271f21 with SHA-1 cbc7c5b171 is in history

Change-Id: Iab15d259b8032a207d7c6ad086987bbf2a9da145
2020-04-14 02:44:58 +00:00
Automerger Merge Worker
cc0ff2e992 Merge "[automerger skipped] Merge "Add more tests for CaptivePortalData" into rvc-dev am: ecbf648b62 am: f0bfba755b -s ours" into rvc-d1-dev-plus-aosp am: 9cb7c955d9 -s ours am: 33efaee6eb -s ours
am skip reason: Change-Id I6d3826922f16816d5b18ed3540266442a0ed3e49 with SHA-1 cec556227a is in history

Change-Id: I5b6afa12958ae79b7c42ca63cf619ccbd4a0927a
2020-04-14 02:33:47 +00:00
Chiachang Wang
fd4dc5470c [automerger skipped] Merge "Add more tests for CaptivePortalData" into rvc-dev am: ecbf648b62 -s ours am: 4618919428 -s ours am: 302b4175eb -s ours am: 48d37076b4 -s ours
am skip reason: Change-Id I6d3826922f16816d5b18ed3540266442a0ed3e49 with SHA-1 ac7fe6c583 is in history

Change-Id: I6b082d8669e77cb0f9859a6238c8084064ad81cf
2020-04-14 02:33:16 +00:00