Commit Graph

9685 Commits

Author SHA1 Message Date
Chalard Jean
636f18998f Merge "Add instrumentation to test NetworkAgent." am: eb1d6593c5 am: 6dcb6a943c am: 6edf06afb0
Change-Id: I2fee5c4a0d104931095b355d96513e016ef953a4
2020-04-13 15:35:58 +00:00
Chalard Jean
6edf06afb0 Merge "Add instrumentation to test NetworkAgent." am: eb1d6593c5 am: 6dcb6a943c
Change-Id: Ief4f6bd95ba513e08c5d2e9e8fef9d0c426b4478
2020-04-13 15:22:45 +00:00
Chalard Jean
6dcb6a943c Merge "Add instrumentation to test NetworkAgent." am: eb1d6593c5
Change-Id: I799ad6fa5d6f1bf522414081bac75c952ad2baf7
2020-04-13 15:05:03 +00:00
Chalard Jean
eb1d6593c5 Merge "Add instrumentation to test NetworkAgent." 2020-04-13 14:47:58 +00:00
Chiachang Wang
463a43134e Merge "Add more tests for CaptivePortalData" am: 422052213c am: 3251b09f29 am: 39bf62187a
Change-Id: Ic01266269d9138e0b3944c039513f5ef419d3ac2
2020-04-13 10:27:26 +00:00
Chiachang Wang
39bf62187a Merge "Add more tests for CaptivePortalData" am: 422052213c am: 3251b09f29
Change-Id: If5c56ad5ee02acf5964d31eb2445e3cd52249dc5
2020-04-13 10:26:27 +00:00
Chiachang Wang
3251b09f29 Merge "Add more tests for CaptivePortalData" am: 422052213c
Change-Id: I68aaf60a82227d647dbf3394ae6ec87627426a7e
2020-04-13 10:07:11 +00:00
Chiachang Wang
c519d48641 Merge "Move CaptivePortalDataTest to common test to support cts" am: 40c78f06d5 am: a59282f5e5 am: 40e7a8c196
Change-Id: I0dca2b214fece93379c3badc0abad2e39cbf3084
2020-04-13 09:51:07 +00:00
Chiachang Wang
422052213c Merge "Add more tests for CaptivePortalData" 2020-04-13 09:46:20 +00:00
Chiachang Wang
40e7a8c196 Merge "Move CaptivePortalDataTest to common test to support cts" am: 40c78f06d5 am: a59282f5e5
Change-Id: I9b0424c22d1711e111bac200b026f7829bc1de48
2020-04-13 09:33:03 +00:00
Chiachang Wang
a59282f5e5 Merge "Move CaptivePortalDataTest to common test to support cts" am: 40c78f06d5
Change-Id: If5a2f476285d3e276d6fdbb695514489de18cb50
2020-04-13 09:12:26 +00:00
Chiachang Wang
d4a9e976e8 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
40c78f06d5 Merge "Move CaptivePortalDataTest to common test to support cts" 2020-04-13 08:56:31 +00:00
Chiachang Wang
210a4da6ed 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
0b172d6811 [automerger skipped] Merge "Set transport types to resolver" am: d275ec139a am: c368e9352b -s ours am: ca387f7c23 -s ours
am skip reason: Change-Id I03fc5c62dfd9a51a78a720860531df282fdecc20 with SHA-1 82682799d7 is in history

Change-Id: Ifc156cb1e0859cf3b1b37c85f1d64b957cdd5938
2020-04-13 07:50:19 +00:00
Lorenzo Colitti
ca387f7c23 [automerger skipped] Merge "Set transport types to resolver" am: d275ec139a am: c368e9352b -s ours
am skip reason: Change-Id I03fc5c62dfd9a51a78a720860531df282fdecc20 with SHA-1 82682799d7 is in history

Change-Id: I9a13896d00c28868584fcc18b0f7f6f11ba0f398
2020-04-13 07:30:56 +00:00
Lorenzo Colitti
c368e9352b Merge "Set transport types to resolver" am: d275ec139a
Change-Id: I26b6e523bbc6ccd6e57a1b30782b74c6c33a7fbb
2020-04-13 07:22:21 +00:00
Lorenzo Colitti
d275ec139a Merge "Set transport types to resolver" 2020-04-13 07:03:20 +00:00
Chalard Jean
be9447be58 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
b33a8f3bda Merge "Set transport types to resolver" into rvc-dev am: a6182bb9da am: 82682799d7
Change-Id: Ic7bd778f3b9cbc1255318174f0aa233e8604a7d6
2020-04-11 15:04:32 +00:00
chenbruce
7b2f898a9a 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
595d2e9077 Merge "Set transport types to resolver" into rvc-dev am: a6182bb9da am: 45160bca9f
Change-Id: Iab511914c1d3337f32fd43a5dafb9d54a68abfe9
2020-04-11 14:52:46 +00:00
TreeHugger Robot
82682799d7 Merge "Set transport types to resolver" into rvc-dev am: a6182bb9da
Change-Id: I03fc5c62dfd9a51a78a720860531df282fdecc20
2020-04-11 14:42:34 +00:00
TreeHugger Robot
45160bca9f Merge "Set transport types to resolver" into rvc-dev am: a6182bb9da
Change-Id: I0ee02778a7e2a5bf54ec73edf34fe1a4d98c6ebe
2020-04-11 14:41:01 +00:00
TreeHugger Robot
a6182bb9da Merge "Set transport types to resolver" into rvc-dev 2020-04-11 14:25:27 +00:00
chenbruce
db2aad69ed 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
b50e46aaa3 [automerger skipped] Merge "Fix a theoretical NPE" into rvc-dev am: ce6aa16b80 -s ours am: 22164d8f4b -s ours
am skip reason: Change-Id I08f57cce0cd85d5cd66e9a0ef948224290e9200e with SHA-1 35a06972cc is in history

Change-Id: Iccf2b1edcb9fada0ce6b4a0310c75cc76cd5697f
2020-04-11 05:35:48 +00:00
Chalard Jean
10bfc9f962 [automerger skipped] Merge "Fix a theoretical NPE" into rvc-dev am: ce6aa16b80 am: dbcce5454b -s ours
am skip reason: Change-Id I08f57cce0cd85d5cd66e9a0ef948224290e9200e with SHA-1 35a06972cc is in history

Change-Id: I85be912aac50b5dd56f57a8962e98fdf641c2cb3
2020-04-11 05:34:19 +00:00
Chalard Jean
22164d8f4b [automerger skipped] Merge "Fix a theoretical NPE" into rvc-dev am: ce6aa16b80 -s ours
am skip reason: Change-Id I08f57cce0cd85d5cd66e9a0ef948224290e9200e with SHA-1 35a06972cc is in history

Change-Id: Iaa695bbf4cfdb71900b6b06b62db7222a0c0019d
2020-04-11 05:17:38 +00:00
Chalard Jean
dbcce5454b Merge "Fix a theoretical NPE" into rvc-dev am: ce6aa16b80
Change-Id: I82c5df71163bfe14a5d0eb6b8fb3628cb67defb6
2020-04-11 05:16:38 +00:00
Treehugger Robot
b9db69f623 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
6f31ffa073 [automerger skipped] Merge changes from topic "phonestatelistener-limit-rvc-dev" am: 24e6e442b7 am: 98e3a26b78 -s ours am: 7947b6459b -s ours
am skip reason: Change-Id I4d6681d90705b68c3349f4124e434a29b50fd3a2 with SHA-1 f4667b4925 is in history

Change-Id: I9e67f4166f73d05f23fe041206373ba32b421165
2020-04-11 01:22:00 +00:00
Hall Liu
7947b6459b [automerger skipped] Merge changes from topic "phonestatelistener-limit-rvc-dev" am: 24e6e442b7 am: 98e3a26b78 -s ours
am skip reason: Change-Id I4d6681d90705b68c3349f4124e434a29b50fd3a2 with SHA-1 f4667b4925 is in history

Change-Id: Iedaadfdbb8a0308d0f602adda2569253f8dd0afd
2020-04-11 01:10:32 +00:00
Hall Liu
98e3a26b78 Merge changes from topic "phonestatelistener-limit-rvc-dev" am: 24e6e442b7
Change-Id: I23df0fed3c46b2aeb3bf561e82460ffc41a6928c
2020-04-11 00:56:02 +00:00
Hall Liu
24e6e442b7 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
6b515671e8 [automerger skipped] Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6382244 into stag-aosp-master" into stage-aosp-master am: 0a70e4c3d0 -s ours am: df46fa62d1
Change-Id: Iacf67657f069b367dc7c7b8aff7d3a292853ea0e
2020-04-10 19:27:37 +00:00
Xin Li
df46fa62d1 [automerger skipped] Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6382244 into stag-aosp-master" into stage-aosp-master am: 0a70e4c3d0 -s ours
am skip reason: subject contains skip directive

Change-Id: I99ef66bbbf796a104bedf3da2909e47cbe023f6f
2020-04-10 19:07:11 +00:00
Xin Li
0a70e4c3d0 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
c9da3041b2 Merge "Fix a theoretical NPE" am: e21dccde6b am: 49021c2c68 am: e75cd4b458
Change-Id: Ief314b04963c0ddaf027823a21ee70e84870a94a
2020-04-10 18:06:28 +00:00
Treehugger Robot
e75cd4b458 Merge "Fix a theoretical NPE" am: e21dccde6b am: 49021c2c68
Change-Id: Ibf814e81ca984b47b9be1e423e2cde908cf7f193
2020-04-10 17:08:04 +00:00
Treehugger Robot
49021c2c68 Merge "Fix a theoretical NPE" am: e21dccde6b
Change-Id: Idf4cb0acbfb9bc8fef43d42be477778e8ec2fc09
2020-04-10 16:44:25 +00:00
Treehugger Robot
e21dccde6b Merge "Fix a theoretical NPE" 2020-04-10 16:25:07 +00:00
Chalard Jean
35a06972cc Fix a theoretical NPE
Test: NetworkAgentTests
Bug: 153718627
Change-Id: I08f57cce0cd85d5cd66e9a0ef948224290e9200e
2020-04-10 23:08:00 +09:00
Lucas Lin
5ee6637c32 [automerger skipped] Merge "Set WifiAwareNetworkInfo into setTransportInfo()" am: 6056ec00bf am: 663817b515 -s ours am: e32dfcc505 -s ours
am skip reason: Change-Id Ibbe1cd126d6538003fbb1e5e85892bfb15a920e8 with SHA-1 ec5e7af977 is in history

Change-Id: I4e1d4eef651001c873c504cba74619a7864b8f2f
2020-04-09 03:25:40 +00:00
Lucas Lin
c42c6af0c6 Merge "Set WifiAwareNetworkInfo into setTransportInfo()" am: 6056ec00bf am: 663817b515
Change-Id: I6ca0f9041b3a3b30ee98a00420c08723c8a57be8
2020-04-09 03:12:57 +00:00
Lucas Lin
e32dfcc505 [automerger skipped] Merge "Set WifiAwareNetworkInfo into setTransportInfo()" am: 6056ec00bf am: 663817b515 -s ours
am skip reason: Change-Id Ibbe1cd126d6538003fbb1e5e85892bfb15a920e8 with SHA-1 ec5e7af977 is in history

Change-Id: Icc020d872394b2bce4983b55a9fae96cff919c98
2020-04-09 03:12:50 +00:00
Lucas Lin
663817b515 Merge "Set WifiAwareNetworkInfo into setTransportInfo()" am: 6056ec00bf
Change-Id: Ib99da397256138cb16ce7873df50996e1fe8be1a
2020-04-09 02:53:46 +00:00
Automerger Merge Worker
9c7451b0f0 Merge "Merge "Set WifiAwareNetworkInfo into setTransportInfo()" into rvc-dev am: d8a5511b92 am: 40384fb927" into rvc-d1-dev-plus-aosp 2020-04-08 10:17:33 +00:00
TreeHugger Robot
d5f2fde57d Merge "Set WifiAwareNetworkInfo into setTransportInfo()" into rvc-dev am: d8a5511b92 am: 082a9f45bf
Change-Id: I7ce37a993d3a8b7639ea0444ccd32af68f6b045b
2020-04-08 10:17:25 +00:00
TreeHugger Robot
a32ef981e4 Merge "Set WifiAwareNetworkInfo into setTransportInfo()" into rvc-dev am: d8a5511b92 am: 40384fb927
Change-Id: Ia40c524903c7e66f26985f81f1aeafc291d9f5fd
2020-04-08 10:17:25 +00:00