Commit Graph

9834 Commits

Author SHA1 Message Date
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
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
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
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
33efaee6eb 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 skip reason: Change-Id I6d3826922f16816d5b18ed3540266442a0ed3e49 with SHA-1 cec556227a is in history

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

Change-Id: I4156d861f9621213a93d7bdbe0ecad7b2b805bae
2020-04-14 02:12:07 +00:00
Chiachang Wang
584ab8643d [automerger skipped] Merge "Move CaptivePortalDataTest to common test to support cts" into rvc-dev am: 7448287450 -s ours am: 71e2367ade -s ours am: 09995066c7 -s ours
am skip reason: Change-Id Iddd00e1c85abe767b1a41a1761d3266ba322dba6 with SHA-1 be79897cb5 is in history

Change-Id: Iea7c787e40317fd68f98dbf211a95bced64bdb7f
2020-04-14 02:11:43 +00:00
Chiachang Wang
3a18486086 [automerger skipped] Merge "Move CaptivePortalDataTest to common test to support cts" into rvc-dev am: 7448287450 am: 02adeaa9c1 -s ours am: cf89719edc -s ours
am skip reason: Change-Id Iddd00e1c85abe767b1a41a1761d3266ba322dba6 with SHA-1 d8a33be2e3 is in history

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

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

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

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

Change-Id: I456b3a54dc8a870a7093e08fb36de7c221b062e4
2020-04-14 01:50:37 +00:00
Chalard Jean
def9c47047 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
f0bfba755b Merge "Add more tests for CaptivePortalData" into rvc-dev am: ecbf648b62
Change-Id: I68bf2166d3fafbcab03ec17ea5f134209798e242
2020-04-14 01:21:59 +00:00
Chiachang Wang
4618919428 [automerger skipped] Merge "Add more tests for CaptivePortalData" into rvc-dev am: ecbf648b62 -s ours
am skip reason: Change-Id I6d3826922f16816d5b18ed3540266442a0ed3e49 with SHA-1 ac7fe6c583 is in history

Change-Id: I9d9249b4ae1e31f35a8774f7d145c8afe5ce3145
2020-04-14 01:21:40 +00:00
Chiachang Wang
02adeaa9c1 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
71e2367ade [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 d8a33be2e3 is in history

Change-Id: I9b2476c87531a064165e5514b9e56fadbbcfabd1
2020-04-14 01:21:11 +00:00
Chalard Jean
3f22d66808 Add instrumentation to test NetworkAgent.
Test: NetworkAgentTest, new tests using this API
Bug: 139268426
Change-Id: I0b65be788bb742fd1a8c0ca624e97368462f9b6a
Merged-In: Ia83b1c896df63bb18e2aa4b74d6cc09eba990eb5
(cherry picked from commit d89dcb9765b9c73c950661faaf8af9b795934acb, aosp/1284574)
2020-04-14 01:20:16 +00:00
Chiachang Wang
cec556227a Add more tests for CaptivePortalData
Add missing tests to cover all system APIs

Bug: 152280218
Bug: 150640683
Test: atest CtsNetTestCasesLatestSdk:CaptivePortalDataTest on
      both Q and R device
Change-Id: I6d3826922f16816d5b18ed3540266442a0ed3e49
Merged-In: I6d3826922f16816d5b18ed3540266442a0ed3e49
(cherry picked from commit d9f9bf34637f699608fa3b919b3c85f3d5514a83)
2020-04-14 01:13:21 +00:00
Chalard Jean
05a06d2358 Merge "Allow testing of signal strength" am: 089f46b079 am: cf0f5e8be4 am: 69cdef2be4 am: 1a0f13ac02
Change-Id: I1f52c90e83844aa3780cd95b8d4c0b7bae686a47
2020-04-13 18:52:32 +00:00
Chalard Jean
1a0f13ac02 Merge "Allow testing of signal strength" am: 089f46b079 am: cf0f5e8be4 am: 69cdef2be4
Change-Id: If373495212753b08b7f09f1c474c2bd23ef409b8
2020-04-13 18:15:04 +00:00
Chalard Jean
69cdef2be4 Merge "Allow testing of signal strength" am: 089f46b079 am: cf0f5e8be4
Change-Id: Ib00611c70d9b8fc3e4ee5338980344f5e2167fa1
2020-04-13 17:50:19 +00:00
Chalard Jean
cf0f5e8be4 Merge "Allow testing of signal strength" am: 089f46b079
Change-Id: I2300fe5c9be8a781fea67358c5e1774872b29f7c
2020-04-13 17:32:30 +00:00