Commit Graph

9712 Commits

Author SHA1 Message Date
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
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
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
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
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
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
d91f16f11c Merge "Add more tests for CaptivePortalData" am: 4ae6e556c1
Change-Id: I68aaf60a82227d647dbf3394ae6ec87627426a7e
2020-04-13 10:07:11 +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
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
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
Lorenzo Colitti
2b607c81cc Merge "Set transport types to resolver" am: 3c0c668d87
Change-Id: I26b6e523bbc6ccd6e57a1b30782b74c6c33a7fbb
2020-04-13 07:22:21 +00:00
Lorenzo Colitti
3c0c668d87 Merge "Set transport types to resolver" 2020-04-13 07:03:20 +00:00
Chalard Jean
2116068514 Add instrumentation to test NetworkAgent.
Test: NetworkAgentTest, new tests using this API
Bug: 139268426
Change-Id: Ia83b1c896df63bb18e2aa4b74d6cc09eba990eb5
2020-04-13 15:44:07 +09:00
TreeHugger Robot
a0e7c8765a Merge "Set transport types to resolver" into rvc-dev am: 89d243c5c3 am: 935dde5458
Change-Id: Ic7bd778f3b9cbc1255318174f0aa233e8604a7d6
2020-04-11 15:04:32 +00:00
chenbruce
2e6b79f3d2 Set transport types to resolver
For a given network, resolver doesn't know what transport types are.
Therefore, when a new network is created or transport types are changed
in a give network, transport types will be updated and sent by calling
setResolverConfiguration(). In the same time, if link properties or
transport types are null, setResolverConfiguration() won't be called.
The original behaviors of setResolverConfiguration() aren't changed.
Only increasing one new behavior that when a given network has transport
type change, calling setResolverConfiguration() directly and resolver
updates the transport types for that given network.

Bug: 143732914
Test: atest FrameworksNetTests
      atest FrameworksNetIntegrationTests
Merged-In: I03fc5c62dfd9a51a78a720860531df282fdecc20
Change-Id: I6527cde0e177ba08c886576131b35fc769c2bb53
2020-04-11 23:00:13 +08:00
TreeHugger Robot
809ddd05f3 Merge "Set transport types to resolver" into rvc-dev am: 89d243c5c3 am: 97d89a171a
Change-Id: Iab511914c1d3337f32fd43a5dafb9d54a68abfe9
2020-04-11 14:52:46 +00:00
TreeHugger Robot
935dde5458 Merge "Set transport types to resolver" into rvc-dev am: 89d243c5c3
Change-Id: I03fc5c62dfd9a51a78a720860531df282fdecc20
2020-04-11 14:42:34 +00:00