Commit Graph

9328 Commits

Author SHA1 Message Date
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
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
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
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
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
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
935dde5458 Merge "Set transport types to resolver" into rvc-dev am: 89d243c5c3
Change-Id: I03fc5c62dfd9a51a78a720860531df282fdecc20
2020-04-11 14:42:34 +00:00
TreeHugger Robot
89d243c5c3 Merge "Set transport types to resolver" into rvc-dev 2020-04-11 14:25:27 +00:00
chenbruce
37a06201f0 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
Change-Id: I6527cde0e177ba08c886576131b35fc769c2bb53
2020-04-11 14:39:59 +08:00
Chalard Jean
7509295d18 [automerger skipped] Merge "Fix a theoretical NPE" into rvc-dev am: ce6aa16b80 -s ours
am skip reason: Change-Id I08f57cce0cd85d5cd66e9a0ef948224290e9200e with SHA-1 5d8bc4b1ac is in history

Change-Id: Iaa695bbf4cfdb71900b6b06b62db7222a0c0019d
2020-04-11 05:17:38 +00:00
Treehugger Robot
7d75bc365b Fix a theoretical NPE
Test: NetworkAgentTests
Bug: 153718627

Change-Id: I955b6dac6de48b12696dc640f131f5983ac552df
Merged-In: I08f57cce0cd85d5cd66e9a0ef948224290e9200e
(cherry picked from commit 31492c708746a51f70c74913a4d6cd97bf06ae63, aosp/1284575)
2020-04-11 03:26:27 +00:00
Hall Liu
c1ec9a6d5b [automerger skipped] Merge changes from topic "phonestatelistener-limit-rvc-dev" am: 0167936be4 am: a7d042ad64 -s ours
am skip reason: Change-Id I4d6681d90705b68c3349f4124e434a29b50fd3a2 with SHA-1 2ca7c9a422 is in history

Change-Id: Iedaadfdbb8a0308d0f602adda2569253f8dd0afd
2020-04-11 01:10:32 +00:00
Hall Liu
a7d042ad64 Merge changes from topic "phonestatelistener-limit-rvc-dev" am: 0167936be4
Change-Id: I23df0fed3c46b2aeb3bf561e82460ffc41a6928c
2020-04-11 00:56:02 +00:00
Hall Liu
0167936be4 Merge changes from topic "phonestatelistener-limit-rvc-dev"
* changes:
  Add gating, logging for PhoneStateListener's limit
  Institute limit on PhoneStateListener
2020-04-11 00:36:13 +00:00
Xin Li
8264f5a534 [automerger skipped] Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6382244 into stag-aosp-master" into stage-aosp-master am: c03f719e8b -s ours
am skip reason: subject contains skip directive

Change-Id: I99ef66bbbf796a104bedf3da2909e47cbe023f6f
2020-04-10 19:07:11 +00:00
Xin Li
c03f719e8b Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6382244 into stag-aosp-master" into stage-aosp-master 2020-04-10 18:42:15 +00:00
Treehugger Robot
c53b4498be Merge "Fix a theoretical NPE" am: 6334d49d44 am: 92c8e43252
Change-Id: Ibf814e81ca984b47b9be1e423e2cde908cf7f193
2020-04-10 17:08:04 +00:00
Treehugger Robot
92c8e43252 Merge "Fix a theoretical NPE" am: 6334d49d44
Change-Id: Idf4cb0acbfb9bc8fef43d42be477778e8ec2fc09
2020-04-10 16:44:25 +00:00
Treehugger Robot
6334d49d44 Merge "Fix a theoretical NPE" 2020-04-10 16:25:07 +00:00
Chalard Jean
5d8bc4b1ac Fix a theoretical NPE
Test: NetworkAgentTests
Bug: 153718627
Change-Id: I08f57cce0cd85d5cd66e9a0ef948224290e9200e
2020-04-10 23:08:00 +09:00
Lucas Lin
96aa080ffe Merge "Set WifiAwareNetworkInfo into setTransportInfo()" am: 6056ec00bf am: 6b21fc4608
Change-Id: I6ca0f9041b3a3b30ee98a00420c08723c8a57be8
2020-04-09 03:12:57 +00:00
Lucas Lin
5eeba5f485 [automerger skipped] Merge "Set WifiAwareNetworkInfo into setTransportInfo()" am: 6056ec00bf am: 6b21fc4608 -s ours
am skip reason: Change-Id Ibbe1cd126d6538003fbb1e5e85892bfb15a920e8 with SHA-1 75f688be48 is in history

Change-Id: Icc020d872394b2bce4983b55a9fae96cff919c98
2020-04-09 03:12:50 +00:00
Lucas Lin
6b21fc4608 Merge "Set WifiAwareNetworkInfo into setTransportInfo()" am: 6056ec00bf
Change-Id: Ib99da397256138cb16ce7873df50996e1fe8be1a
2020-04-09 02:53:46 +00:00
lucaslin
15586a5bae Set WifiAwareNetworkInfo into setTransportInfo()
Bug: 139268426
Bug: 135998869
Bug: 138306002
Test: atest CtsNetTestCasesLatestSdk:NetworkCapabilitiesTest
Change-Id: Ibbe1cd126d6538003fbb1e5e85892bfb15a920e8
Merged-In: Ibbe1cd126d6538003fbb1e5e85892bfb15a920e8
2020-04-08 10:09:16 +00:00
TreeHugger Robot
bc0ff3efe7 Merge "Set WifiAwareNetworkInfo into setTransportInfo()" into rvc-dev am: d8a5511b92
Change-Id: Ie40d640964879d29cb62bcee2445e5bbefca508b
2020-04-08 10:00:02 +00:00
lucaslin
75f688be48 Set WifiAwareNetworkInfo into setTransportInfo()
Bug: 139268426
Bug: 135998869
Bug: 138306002
Test: atest CtsNetTestCasesLatestSdk:NetworkCapabilitiesTest
Change-Id: Ibbe1cd126d6538003fbb1e5e85892bfb15a920e8
2020-04-08 08:11:10 +00:00
Lucas Lin
f3d9033a9e [automerger skipped] Merge "Add more tests in NetworkCapabilitiesTest.java" into rvc-dev am: 1f4713bd4f -s ours
am skip reason: Change-Id I90c7a8c47710ea4ad8e8d2682c10440fd7f82270 with SHA-1 e408eb55dc is in history

Change-Id: Iee0d435b8e41e3d99de864e481d97eed0fec5539
2020-04-08 07:53:59 +00:00
Lucas Lin
1f4713bd4f Merge "Add more tests in NetworkCapabilitiesTest.java" into rvc-dev 2020-04-08 07:40:30 +00:00
lucaslin
7bc3c6f517 Add more tests in NetworkCapabilitiesTest.java
Test deduceRestrictedCapability(), getAdministratorUids(),
setAdministratorUids(), getNetworkSpecifier(), getOwnerUid(),
setLinkDownstreamBandwidthKbps(), setLinkUpstreamBandwidthKbps(),
setSignalStrength() and Builder().

Bug: 139268426
Bug: 135998869
Bug: 138306002
Test: atest CtsNetTestCasesLatestSdk:android.net.NetworkCapabilitiesTest
Change-Id: I525941c47b71cd61ee872fd4d71b02a5d3767e21
Merged-In: I90c7a8c47710ea4ad8e8d2682c10440fd7f82270
2020-04-08 07:37:49 +00:00
Junyu Lai
d8e86b04d8 [automerger skipped] Merge "Fix NetworkStatsApiTest failed on Q device" into rvc-dev am: dd8bbd4996 -s ours
am skip reason: Change-Id Ibf2f8118c459a8d7a0992deca8f0f339ccd1bcea with SHA-1 3bf1224afc is in history

Change-Id: I444aaab0fefdce73e31458da213d1e4a7ed2b95c
2020-04-08 06:00:09 +00:00
Junyu Lai
dd8bbd4996 Merge "Fix NetworkStatsApiTest failed on Q device" into rvc-dev 2020-04-08 05:55:57 +00:00
Chalard Jean
de3a42dd7a [automerger skipped] Merge "Add trivial dependencies tests for the network stack" into rvc-dev am: 976f35b0fe -s ours
am skip reason: Change-Id Ie3c15ed25ef3088d3b9b650ffc7f34f49efa6b81 with SHA-1 dcb74c71db is in history

Change-Id: I08107ba6c907bae11c1f304d82cde94d7ce2e306
2020-04-08 04:37:22 +00:00
Junyu Lai
7192912f3e Fix NetworkStatsApiTest failed on Q device
Currently, the addEntry method is used in constructor of test,
which is not correct since there is no such method in Q devices.

Thus, initialize of NetworkStats variables outside of constructor.

Test: atest NetworkStatsApiTest
Test: atest CtsNetTestCasesLatestSdk:NetworkStatsApiTest on Q device
Bug: 150644692
Change-Id: Ibf2f8118c459a8d7a0992deca8f0f339ccd1bcea
Merged-In: Ibf2f8118c459a8d7a0992deca8f0f339ccd1bcea
(cherry picked from commit ae023a8bbd3a7482fd66547d58759c88e100f207)
2020-04-08 03:13:10 +00:00
Hall Liu
87b8c3304d Add gating, logging for PhoneStateListener's limit
Add gating via PlatformCompat and DeviceConfig and logging via
PlatformCompat to the limit instituted on per-process listeners

Fixes: 152074216
Test: atest CtsTelephonyHostCases
Change-Id: I4d6681d90705b68c3349f4124e434a29b50fd3a2
Merged-In: I4d6681d90705b68c3349f4124e434a29b50fd3a2
2020-04-07 17:13:19 -07:00
Junyu Lai
cfea1b70a0 Merge "Fix NetworkStatsApiTest failed on Q device" am: cd7c6cb6ca am: e1d7d536e3
Change-Id: Icc2e59feaf95ffa002cfbc85f849e87b01af5181
2020-04-07 11:26:44 +00:00
Junyu Lai
a7ae7a7d06 Merge "Fix NetworkStatsApiTest failed on Q device" am: cd7c6cb6ca am: e1d7d536e3
Change-Id: Ie10c2bb91fabe8289c649333c215ab6dc22f18ff
2020-04-07 11:19:54 +00:00