Commit Graph

9840 Commits

Author SHA1 Message Date
Lorenzo Colitti
bfabd77e04 Merge "Support changing the NAT64 prefix without removing it." am: f09bc1734f am: 3813daab0b am: 32dc5cae3c am: 28bf4a853e
Change-Id: Ic82307541b72ea8efa470d13c086016abafe4d9a
2020-04-16 17:08:20 +00:00
Lorenzo Colitti
28bf4a853e Merge "Support changing the NAT64 prefix without removing it." am: f09bc1734f am: 3813daab0b am: 32dc5cae3c
Change-Id: I61c2f5c46e4e968ab1777432042b615186829cba
2020-04-16 16:56:20 +00:00
Lorenzo Colitti
32dc5cae3c Merge "Support changing the NAT64 prefix without removing it." am: f09bc1734f am: 3813daab0b
Change-Id: I19050527eb41a58c7844972f34e92719d2344c27
2020-04-16 16:49:33 +00:00
Lorenzo Colitti
3813daab0b Merge "Support changing the NAT64 prefix without removing it." am: f09bc1734f
Change-Id: I2616aba51bdad9afa2dddf6011355f14e4b5457e
2020-04-16 16:37:08 +00:00
Lorenzo Colitti
f09bc1734f Merge "Support changing the NAT64 prefix without removing it." 2020-04-16 16:24:57 +00:00
Junyu Lai
1cd9143ddc [automerger skipped] Merge "[SM10] Adopt helper class to monitor RAT type change per sub" into rvc-dev am: dd44555083 am: f678f57af2 -s ours am: 638210eba2 -s ours
am skip reason: Change-Id I45c3aa9046b316c8cd0943543d620a22e4afefd1 with SHA-1 c6081f9c50 is in history

Change-Id: I8af177e7714eeed230a0781016e240ebce6e95eb
2020-04-15 19:13:47 +00:00
Junyu Lai
1232358bd8 [automerger skipped] Merge "[SM10] Adopt helper class to monitor RAT type change per sub" into rvc-dev am: dd44555083 am: 2ae015277e am: 105ff66812 -s ours
am skip reason: Change-Id I45c3aa9046b316c8cd0943543d620a22e4afefd1 with SHA-1 c6081f9c50 is in history

Change-Id: Iac21e8421c0de2ef41edd1ac82488c352029631a
2020-04-15 19:00:17 +00:00
Junyu Lai
b89d3f5508 Merge "[SP27.3] Rename TestableNetworkStatsProvider" into rvc-dev am: 3db3e009be am: 6a6e61517d am: 6736990a4a
Change-Id: Icf88c06793586dd4cb04f65d24cc9792953ee8d5
2020-04-15 18:58:04 +00:00
Automerger Merge Worker
84680178f2 Merge "Merge "[SP27.3] Rename TestableNetworkStatsProvider" into rvc-dev am: 3db3e009be am: a9a966c265" into rvc-d1-dev-plus-aosp am: 2674aa108b
Change-Id: I852222487a3e8552e6cde374af718dcd1975618a
2020-04-15 18:57:42 +00:00
Junyu Lai
bb702e4865 Merge "[SM10] Adopt helper class to monitor RAT type change per sub" into rvc-dev am: dd44555083 am: 2ae015277e am: edd5229bb5 am: b3e4446eb3
Change-Id: I8c4e71f3d64b6cea509d5e8654ed919fcf7d4108
2020-04-15 18:49:11 +00:00
Junyu Lai
a20fa8da79 Merge "[SP27.3] Rename TestableNetworkStatsProvider" into rvc-dev am: 3db3e009be am: a9a966c265 am: 0bce5338ac am: 6afc29bd6f
Change-Id: I084adb9cdbe2093bb2f94e7b5f75048496b63d7f
2020-04-15 18:48:03 +00:00
Junyu Lai
638210eba2 [automerger skipped] Merge "[SM10] Adopt helper class to monitor RAT type change per sub" into rvc-dev am: dd44555083 am: f678f57af2 -s ours
am skip reason: Change-Id I45c3aa9046b316c8cd0943543d620a22e4afefd1 with SHA-1 c6081f9c50 is in history

Change-Id: Idade28f3ca80b48d8d56d3584cbf195c2f250c40
2020-04-15 17:58:23 +00:00
Junyu Lai
105ff66812 Merge "[SM10] Adopt helper class to monitor RAT type change per sub" into rvc-dev am: dd44555083 am: 2ae015277e
Change-Id: I883b3b8d699bda1b640992b621b547048f057807
2020-04-15 17:48:41 +00:00
Junyu Lai
6736990a4a Merge "[SP27.3] Rename TestableNetworkStatsProvider" into rvc-dev am: 3db3e009be am: 6a6e61517d
Change-Id: I06ac6c1a3090a3ac52270f92e7d717ef8107af98
2020-04-15 17:47:59 +00:00
Junyu Lai
17826a8611 Merge "[SP27.3] Rename TestableNetworkStatsProvider" into rvc-dev am: 3db3e009be am: a9a966c265
Change-Id: I04a4ebcc5ef0ece209722a27b91c46f8c483bda0
2020-04-15 17:47:51 +00:00
Junyu Lai
f678f57af2 Merge "[SM10] Adopt helper class to monitor RAT type change per sub" into rvc-dev am: dd44555083
Change-Id: I5dd2e734cd8ce6637c39e57a6b302447bc0f295f
2020-04-15 17:26:19 +00:00
Junyu Lai
2ae015277e Merge "[SM10] Adopt helper class to monitor RAT type change per sub" into rvc-dev am: dd44555083
Change-Id: I6cfb8d5a6d1306200d63afa6770df89472bd2f81
2020-04-15 17:26:05 +00:00
Junyu Lai
a9a966c265 Merge "[SP27.3] Rename TestableNetworkStatsProvider" into rvc-dev am: 3db3e009be
Change-Id: I5f1820bc4487bea25b75e1b82365d6833372b0c3
2020-04-15 17:25:21 +00:00
Junyu Lai
6a6e61517d Merge "[SP27.3] Rename TestableNetworkStatsProvider" into rvc-dev am: 3db3e009be
Change-Id: Ice8c64d926e026ebc9d993330a84d57007782a99
2020-04-15 17:24:41 +00:00
Lorenzo Colitti
7f3d684631 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
dd44555083 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
3db3e009be Merge "[SP27.3] Rename TestableNetworkStatsProvider" into rvc-dev 2020-04-15 10:44:23 +00:00
junyulai
c6081f9c50 [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
Chalard Jean
dfea565f43 [automerger skipped] Merge "Add instrumentation to test NetworkAgent." into rvc-dev am: 008a54b355 -s ours am: 8ec489e448 -s ours am: b28f8e7b72 -s ours
am skip reason: Change-Id Ia83b1c896df63bb18e2aa4b74d6cc09eba990eb5 with SHA-1 be9447be58 is in history

Change-Id: Ifb1fa26414b5c5b1f15b28e9d67b8ca3e4b69e2d
2020-04-14 05:51:22 +00:00
Chalard Jean
7dc1e05531 [automerger skipped] Merge "Add instrumentation to test NetworkAgent." into rvc-dev am: 008a54b355 am: 1021a87273 -s ours am: 0d20823a2e -s ours
am skip reason: Change-Id Ia83b1c896df63bb18e2aa4b74d6cc09eba990eb5 with SHA-1 be9447be58 is in history

Change-Id: I24c59bdca833863af7f888f37a39344128d4a616
2020-04-14 05:50:59 +00:00
Chalard Jean
b28f8e7b72 [automerger skipped] Merge "Add instrumentation to test NetworkAgent." into rvc-dev am: 008a54b355 -s ours am: 8ec489e448 -s ours
am skip reason: Change-Id Ia83b1c896df63bb18e2aa4b74d6cc09eba990eb5 with SHA-1 be9447be58 is in history

Change-Id: If6ce5315f3666418eb808303ff85d9e87a1246f1
2020-04-14 05:30:44 +00:00
Chalard Jean
0d20823a2e [automerger skipped] Merge "Add instrumentation to test NetworkAgent." into rvc-dev am: 008a54b355 am: 1021a87273 -s ours
am skip reason: Change-Id Ia83b1c896df63bb18e2aa4b74d6cc09eba990eb5 with SHA-1 be9447be58 is in history

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

Change-Id: I92c0c3da037eabed28f78c09ffad80074602dd5f
2020-04-14 05:13:38 +00:00
Chalard Jean
1021a87273 Merge "Add instrumentation to test NetworkAgent." into rvc-dev am: 008a54b355
Change-Id: Iadbfaa4dff8effc6c7ece6fd6f3af1a1dc58b7c0
2020-04-14 05:12:48 +00:00
Chalard Jean
008a54b355 Merge "Add instrumentation to test NetworkAgent." into rvc-dev 2020-04-14 04:54:33 +00:00
Chalard Jean
0ff7e1a82a [automerger skipped] Merge "Allow testing of signal strength" into rvc-dev am: 4947356664 am: 433c8ff695 -s ours am: dbd0a403a2 -s ours
am skip reason: Change-Id I2b4b89be3e69f4853fd6978d2c8f5c8eb4271f21 with SHA-1 6b59b8fbcc is in history

Change-Id: I8d942691d1032e6567407b19c72d194274d38c5b
2020-04-14 03:07:24 +00:00
Chalard Jean
f85cd0e29b [automerger skipped] Merge "Allow testing of signal strength" into rvc-dev am: 4947356664 -s ours am: 55189c962c -s ours am: 2b669476b1 -s ours
am skip reason: Change-Id I2b4b89be3e69f4853fd6978d2c8f5c8eb4271f21 with SHA-1 6b59b8fbcc is in history

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

Change-Id: Id16481c143b1aa83ca3e9b76fc5245e97b0f4ed8
2020-04-14 03:05:43 +00:00
Chalard Jean
2b669476b1 [automerger skipped] Merge "Allow testing of signal strength" into rvc-dev am: 4947356664 -s ours am: 55189c962c -s ours
am skip reason: Change-Id I2b4b89be3e69f4853fd6978d2c8f5c8eb4271f21 with SHA-1 6b59b8fbcc is in history

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

Change-Id: Iab15d259b8032a207d7c6ad086987bbf2a9da145
2020-04-14 02:44:58 +00:00
Automerger Merge Worker
b6f24fa57d Merge "[automerger skipped] Merge "Add more tests for CaptivePortalData" into rvc-dev am: ecbf648b62 am: 3e58ebdaad -s ours" into rvc-d1-dev-plus-aosp am: bf9b8ac7cd -s ours
am skip reason: Change-Id I6d3826922f16816d5b18ed3540266442a0ed3e49 with SHA-1 424cced078 is in history

Change-Id: Ie076c44aeebb3c2946828069b633a437cb9f036a
2020-04-14 02:12:20 +00:00
Chiachang Wang
ea6638cae0 [automerger skipped] Merge "Add more tests for CaptivePortalData" into rvc-dev am: ecbf648b62 -s ours am: 582b76a851 -s ours am: 4bd1422ab6 -s ours
am skip reason: Change-Id I6d3826922f16816d5b18ed3540266442a0ed3e49 with SHA-1 d4a9e976e8 is in history

Change-Id: I4156d861f9621213a93d7bdbe0ecad7b2b805bae
2020-04-14 02:12:07 +00:00
Chiachang Wang
e16fd48480 [automerger skipped] Merge "Move CaptivePortalDataTest to common test to support cts" into rvc-dev am: 7448287450 -s ours am: 0bd3215610 -s ours am: 5201242a70 -s ours
am skip reason: Change-Id Iddd00e1c85abe767b1a41a1761d3266ba322dba6 with SHA-1 3acd429ba3 is in history

Change-Id: Iea7c787e40317fd68f98dbf211a95bced64bdb7f
2020-04-14 02:11:43 +00:00
Chiachang Wang
276bf24239 [automerger skipped] Merge "Move CaptivePortalDataTest to common test to support cts" into rvc-dev am: 7448287450 am: a82d1a814a -s ours am: 10e5682594 -s ours
am skip reason: Change-Id Iddd00e1c85abe767b1a41a1761d3266ba322dba6 with SHA-1 210a4da6ed is in history

Change-Id: Ic97ef61a0430d2b74a84f0667599d9030db8e727
2020-04-14 02:11:25 +00:00
Automerger Merge Worker
bf9b8ac7cd Merge "[automerger skipped] Merge "Add more tests for CaptivePortalData" into rvc-dev am: ecbf648b62 am: 3e58ebdaad -s ours" into rvc-d1-dev-plus-aosp 2020-04-14 01:51:13 +00:00
Chiachang Wang
bb3a37693d [automerger skipped] Merge "Add more tests for CaptivePortalData" into rvc-dev am: ecbf648b62 am: 3e58ebdaad -s ours
am skip reason: Change-Id I6d3826922f16816d5b18ed3540266442a0ed3e49 with SHA-1 d4a9e976e8 is in history

Change-Id: I42468e9cb6388a5db783438d3394311192c140a9
2020-04-14 01:51:10 +00:00
Chiachang Wang
4bd1422ab6 [automerger skipped] Merge "Add more tests for CaptivePortalData" into rvc-dev am: ecbf648b62 -s ours am: 582b76a851 -s ours
am skip reason: Change-Id I6d3826922f16816d5b18ed3540266442a0ed3e49 with SHA-1 d4a9e976e8 is in history

Change-Id: Ic47ea1465a052bf004609b25c1fff423d81df6fd
2020-04-14 01:51:06 +00:00
Chiachang Wang
5201242a70 [automerger skipped] Merge "Move CaptivePortalDataTest to common test to support cts" into rvc-dev am: 7448287450 -s ours am: 0bd3215610 -s ours
am skip reason: Change-Id Iddd00e1c85abe767b1a41a1761d3266ba322dba6 with SHA-1 3acd429ba3 is in history

Change-Id: Icb370b6156503696acf58158597e658c6bd8e6d3
2020-04-14 01:50:53 +00:00
Chiachang Wang
10e5682594 [automerger skipped] Merge "Move CaptivePortalDataTest to common test to support cts" into rvc-dev am: 7448287450 am: a82d1a814a -s ours
am skip reason: Change-Id Iddd00e1c85abe767b1a41a1761d3266ba322dba6 with SHA-1 210a4da6ed is in history

Change-Id: I456b3a54dc8a870a7093e08fb36de7c221b062e4
2020-04-14 01:50:37 +00:00
Chalard Jean
0e9a7738d0 Allow testing of signal strength
- Let any process with NETWORK_SETTINGS register for signal strength
  wakeup.
- Allow agents registering test networks to assign them a signal
  strength.

Test: NetworkAgentTest
Bug: 139268426
Change-Id: Iebfeb9316bcbd8472459c517abb16f1f9d879871
Merged-In: I2b4b89be3e69f4853fd6978d2c8f5c8eb4271f21
(cherry picked from commit 5cc7b18fe7fa94ce2e30572c476df445ed337741, aosp/1284585)
2020-04-14 01:22:14 +00:00
Chiachang Wang
3e58ebdaad Merge "Add more tests for CaptivePortalData" into rvc-dev am: ecbf648b62
Change-Id: I68bf2166d3fafbcab03ec17ea5f134209798e242
2020-04-14 01:21:59 +00:00
Chiachang Wang
582b76a851 [automerger skipped] Merge "Add more tests for CaptivePortalData" into rvc-dev am: ecbf648b62 -s ours
am skip reason: Change-Id I6d3826922f16816d5b18ed3540266442a0ed3e49 with SHA-1 d4a9e976e8 is in history

Change-Id: I9d9249b4ae1e31f35a8774f7d145c8afe5ce3145
2020-04-14 01:21:40 +00:00
Chiachang Wang
a82d1a814a Merge "Move CaptivePortalDataTest to common test to support cts" into rvc-dev am: 7448287450
Change-Id: I56149a0d137fa346affd22278a7fbfecbb7b0643
2020-04-14 01:21:16 +00:00
Chiachang Wang
0bd3215610 [automerger skipped] Merge "Move CaptivePortalDataTest to common test to support cts" into rvc-dev am: 7448287450 -s ours
am skip reason: Change-Id Iddd00e1c85abe767b1a41a1761d3266ba322dba6 with SHA-1 210a4da6ed is in history

Change-Id: I9b2476c87531a064165e5514b9e56fadbbcfabd1
2020-04-14 01:21:11 +00:00