Commit Graph

10081 Commits

Author SHA1 Message Date
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
Chiachang Wang
b3f30339f8 [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: 584ab8643d -s ours
am skip reason: Change-Id Iddd00e1c85abe767b1a41a1761d3266ba322dba6 with SHA-1 be79897cb5 is in history

Change-Id: Ib8143602bd50d5a71fadd42f9435887e1364e096
2020-04-14 02:32:56 +00:00
Chiachang Wang
53e208bc9c [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: 3a18486086 -s ours
am skip reason: Change-Id Iddd00e1c85abe767b1a41a1761d3266ba322dba6 with SHA-1 d8a33be2e3 is in history

Change-Id: I0e3e8d7f856fb4076efbc220127745341890912b
2020-04-14 02:32:36 +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
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
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
3fb74e40c5 Merge "Allow testing of signal strength" am: 089f46b079 am: cf0f5e8be4 am: 69cdef2be4 am: 1a0f13ac02 am: 05a06d2358
Change-Id: I47e4a8f1d88b54fe1f0fa4e8d4a729ec36f6365d
2020-04-13 19:10:13 +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
Chalard Jean
089f46b079 Merge "Allow testing of signal strength" 2020-04-13 17:27:06 +00:00
Chalard Jean
64b0280a22 Merge "Add instrumentation to test NetworkAgent." am: 1afe9973c1 am: cf21bc1551 am: 36b78053aa am: ba2999b41a am: 134084b424
Change-Id: Iaa89732befa47116218ae7f6d11e33b367daa38f
2020-04-13 16:09:41 +00:00
Chalard Jean
134084b424 Merge "Add instrumentation to test NetworkAgent." am: 1afe9973c1 am: cf21bc1551 am: 36b78053aa am: ba2999b41a
Change-Id: If27c46848e109fef65b172cc3f505e65d31a5202
2020-04-13 15:51:54 +00:00
Chalard Jean
ba2999b41a Merge "Add instrumentation to test NetworkAgent." am: 1afe9973c1 am: cf21bc1551 am: 36b78053aa
Change-Id: I2fee5c4a0d104931095b355d96513e016ef953a4
2020-04-13 15:35:58 +00:00
Chalard Jean
36b78053aa Merge "Add instrumentation to test NetworkAgent." am: 1afe9973c1 am: cf21bc1551
Change-Id: Ief4f6bd95ba513e08c5d2e9e8fef9d0c426b4478
2020-04-13 15:22:45 +00:00
Chalard Jean
cf21bc1551 Merge "Add instrumentation to test NetworkAgent." am: 1afe9973c1
Change-Id: I799ad6fa5d6f1bf522414081bac75c952ad2baf7
2020-04-13 15:05:03 +00:00
Chalard Jean
1afe9973c1 Merge "Add instrumentation to test NetworkAgent." 2020-04-13 14:47:58 +00:00
Chalard Jean
cbc7c5b171 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: I2b4b89be3e69f4853fd6978d2c8f5c8eb4271f21
2020-04-13 21:55:32 +09:00
Chiachang Wang
be79897cb5 Move CaptivePortalDataTest to common test to support cts
Commit has to on top of aosp/1281921 to skip whole test in Q
device since CaptivePortalData class is introduced in R.

Result in Q will be:
[1/1] android.net.CaptivePortalDataTest#skippedClassForDevSdkMismatch: IGNORED

Bug: 152280218
Bug: 150640683
Test: atest CtsNetTestCasesLatestSdk:CaptivePortalDataTest on
      both Q and R device
Merged-In: Iddd00e1c85abe767b1a41a1761d3266ba322dba6
Change-Id: Iddd00e1c85abe767b1a41a1761d3266ba322dba6
2020-04-13 12:50:01 +00:00
Chiachang Wang
b2c239f786 Merge "Add more tests for CaptivePortalData" am: 4ae6e556c1 am: d91f16f11c am: 34b856355d am: 352bcf6b0a am: 8ca8e97461
Change-Id: I5ff3a688b8219380a2c0d9cb1a8dccab34fe1cf8
2020-04-13 10:57:24 +00:00
Chiachang Wang
8ca8e97461 Merge "Add more tests for CaptivePortalData" am: 4ae6e556c1 am: d91f16f11c am: 34b856355d am: 352bcf6b0a
Change-Id: Iebaf121689e4988e1e1ba2cc5467b09738f96918
2020-04-13 10:39:03 +00:00
Chiachang Wang
352bcf6b0a Merge "Add more tests for CaptivePortalData" am: 4ae6e556c1 am: d91f16f11c am: 34b856355d
Change-Id: Ic01266269d9138e0b3944c039513f5ef419d3ac2
2020-04-13 10:27:26 +00:00
Chiachang Wang
34b856355d Merge "Add more tests for CaptivePortalData" am: 4ae6e556c1 am: d91f16f11c
Change-Id: If5c56ad5ee02acf5964d31eb2445e3cd52249dc5
2020-04-13 10:26:27 +00:00
Chiachang Wang
c11bdac62b Merge "Move CaptivePortalDataTest to common test to support cts" am: 164eea2a4f am: 25cf28ca34 am: 602cba33be am: aa039d7734 am: 68d6186780
Change-Id: I4d4daaa3f83aed11252e8da721555657a5dfbaa1
2020-04-13 10:24:58 +00:00
Chiachang Wang
d91f16f11c Merge "Add more tests for CaptivePortalData" am: 4ae6e556c1
Change-Id: I68aaf60a82227d647dbf3394ae6ec87627426a7e
2020-04-13 10:07:11 +00:00
Chiachang Wang
68d6186780 Merge "Move CaptivePortalDataTest to common test to support cts" am: 164eea2a4f am: 25cf28ca34 am: 602cba33be am: aa039d7734
Change-Id: I8a0a179bbdbd5401a0ef5c47f46519e74395fcb6
2020-04-13 10:05:45 +00:00
Chiachang Wang
aa039d7734 Merge "Move CaptivePortalDataTest to common test to support cts" am: 164eea2a4f am: 25cf28ca34 am: 602cba33be
Change-Id: I0dca2b214fece93379c3badc0abad2e39cbf3084
2020-04-13 09:51:07 +00:00
Chiachang Wang
4ae6e556c1 Merge "Add more tests for CaptivePortalData" 2020-04-13 09:46:20 +00:00
Chiachang Wang
602cba33be Merge "Move CaptivePortalDataTest to common test to support cts" am: 164eea2a4f am: 25cf28ca34
Change-Id: I9b0424c22d1711e111bac200b026f7829bc1de48
2020-04-13 09:33:03 +00:00
Chiachang Wang
25cf28ca34 Merge "Move CaptivePortalDataTest to common test to support cts" am: 164eea2a4f
Change-Id: If5a2f476285d3e276d6fdbb695514489de18cb50
2020-04-13 09:12:26 +00:00
Lorenzo Colitti
0847ad7468 [automerger skipped] Merge "Set transport types to resolver" am: 3c0c668d87 am: 2b607c81cc -s ours am: 8121588ee3 -s ours am: 7eff156de8 -s ours am: aadc673c47 -s ours
am skip reason: Change-Id I03fc5c62dfd9a51a78a720860531df282fdecc20 with SHA-1 935dde5458 is in history

Change-Id: I1c7e5b9f91b7fe5fb5c524550a9a608de9f68968
2020-04-13 08:58:50 +00:00
Chiachang Wang
ac7fe6c583 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
2020-04-13 08:58:48 +00:00
Chiachang Wang
164eea2a4f Merge "Move CaptivePortalDataTest to common test to support cts" 2020-04-13 08:56:31 +00:00
Lorenzo Colitti
aadc673c47 [automerger skipped] Merge "Set transport types to resolver" am: 3c0c668d87 am: 2b607c81cc -s ours am: 8121588ee3 -s ours am: 7eff156de8 -s ours
am skip reason: Change-Id I03fc5c62dfd9a51a78a720860531df282fdecc20 with SHA-1 935dde5458 is in history

Change-Id: I87995328b2979c551cae0107766939ba6b53cf3d
2020-04-13 08:41:18 +00:00
Chiachang Wang
d8a33be2e3 Move CaptivePortalDataTest to common test to support cts
Commit has to on top of aosp/1281921 to skip whole test in Q
device since CaptivePortalData class is introduced in R.

Result in Q will be:
[1/1] android.net.CaptivePortalDataTest#skippedClassForDevSdkMismatch: IGNORED

Bug: 152280218
Bug: 150640683
Test: atest CtsNetTestCasesLatestSdk:CaptivePortalDataTest on
      both Q and R device
Change-Id: Iddd00e1c85abe767b1a41a1761d3266ba322dba6
2020-04-13 08:13:04 +00:00
Lorenzo Colitti
7eff156de8 [automerger skipped] Merge "Set transport types to resolver" am: 3c0c668d87 am: 2b607c81cc -s ours am: 8121588ee3 -s ours
am skip reason: Change-Id I03fc5c62dfd9a51a78a720860531df282fdecc20 with SHA-1 935dde5458 is in history

Change-Id: Ifc156cb1e0859cf3b1b37c85f1d64b957cdd5938
2020-04-13 07:50:19 +00:00
Lorenzo Colitti
8121588ee3 [automerger skipped] Merge "Set transport types to resolver" am: 3c0c668d87 am: 2b607c81cc -s ours
am skip reason: Change-Id I03fc5c62dfd9a51a78a720860531df282fdecc20 with SHA-1 935dde5458 is in history

Change-Id: I9a13896d00c28868584fcc18b0f7f6f11ba0f398
2020-04-13 07:30:56 +00:00