LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,675 Commits 2 Branches 0 Tags
aa039d77348ebd859636ffc8b2f2c20c6f36fd74
Commit Graph

9675 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
TreeHugger Robot
97d89a171a Merge "Set transport types to resolver" into rvc-dev am: 89d243c5c3 
Change-Id: I0ee02778a7e2a5bf54ec73edf34fe1a4d98c6ebe
 2020-04-11 14:41:01 +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
5559d7de74 [automerger skipped] Merge "Fix a theoretical NPE" into rvc-dev am: ce6aa16b80 -s ours am: 7509295d18 -s ours 
am skip reason: Change-Id I08f57cce0cd85d5cd66e9a0ef948224290e9200e with SHA-1 5d8bc4b1ac is in history

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

Change-Id: I85be912aac50b5dd56f57a8962e98fdf641c2cb3
 2020-04-11 05:34:19 +00: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
Chalard Jean
567ec866ad Merge "Fix a theoretical NPE" into rvc-dev am: ce6aa16b80 
Change-Id: I82c5df71163bfe14a5d0eb6b8fb3628cb67defb6
 2020-04-11 05:16: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
c383aa06c6 [automerger skipped] Merge changes from topic "phonestatelistener-limit-rvc-dev" am: 0167936be4 am: a7d042ad64 -s ours am: c1ec9a6d5b -s ours 
am skip reason: Change-Id I4d6681d90705b68c3349f4124e434a29b50fd3a2 with SHA-1 2ca7c9a422 is in history

Change-Id: I9e67f4166f73d05f23fe041206373ba32b421165
 2020-04-11 01:22:00 +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
f00bd1e40f [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: 8264f5a534 
Change-Id: Iacf67657f069b367dc7c7b8aff7d3a292853ea0e
 2020-04-10 19:27:37 +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
0e51f38933 Merge "Fix a theoretical NPE" am: 6334d49d44 am: 92c8e43252 am: c53b4498be 
Change-Id: Ief314b04963c0ddaf027823a21ee70e84870a94a
 2020-04-10 18:06:28 +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
c3533010fd [automerger skipped] Merge "Set WifiAwareNetworkInfo into setTransportInfo()" am: 6056ec00bf am: 6b21fc4608 -s ours am: 5eeba5f485 -s ours 
am skip reason: Change-Id Ibbe1cd126d6538003fbb1e5e85892bfb15a920e8 with SHA-1 75f688be48 is in history

Change-Id: I4e1d4eef651001c873c504cba74619a7864b8f2f
 2020-04-09 03:25:40 +00: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
Automerger Merge Worker
3eaeb2d109 Merge "Merge "Set WifiAwareNetworkInfo into setTransportInfo()" into rvc-dev am: d8a5511b92 am: bc0ff3efe7" into rvc-d1-dev-plus-aosp 2020-04-08 10:17:33 +00:00
TreeHugger Robot
7c93981e5d Merge "Set WifiAwareNetworkInfo into setTransportInfo()" into rvc-dev am: d8a5511b92 am: 5e896db967 
Change-Id: I7ce37a993d3a8b7639ea0444ccd32af68f6b045b
 2020-04-08 10:17:25 +00:00
TreeHugger Robot
a500426b70 Merge "Set WifiAwareNetworkInfo into setTransportInfo()" into rvc-dev am: d8a5511b92 am: bc0ff3efe7 
Change-Id: Ia40c524903c7e66f26985f81f1aeafc291d9f5fd
 2020-04-08 10:17:25 +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
TreeHugger Robot
5e896db967 Merge "Set WifiAwareNetworkInfo into setTransportInfo()" into rvc-dev am: d8a5511b92 
Change-Id: Ib40ba2aeb8ed06e4d91a74cf8261af0f5eac2a66
 2020-04-08 09:59:54 +00:00
Automerger Merge Worker
8f44b722ff Merge "[automerger skipped] Merge "Add more tests in NetworkCapabilitiesTest.java" into rvc-dev am: 1f4713bd4f am: 62b8f38312 -s ours" into rvc-d1-dev-plus-aosp 2020-04-08 08:11:56 +00:00
Lucas Lin
165ddef185 [automerger skipped] Merge "Add more tests in NetworkCapabilitiesTest.java" into rvc-dev am: 1f4713bd4f am: 62b8f38312 -s ours 
am skip reason: Change-Id I90c7a8c47710ea4ad8e8d2682c10440fd7f82270 with SHA-1 e408eb55dc is in history

Change-Id: Ib543118f2dba2bd2960dbcb47e762ab16d3c3c10
 2020-04-08 08:11:53 +00:00
Lucas Lin
f988f41260 [automerger skipped] Merge "Add more tests in NetworkCapabilitiesTest.java" into rvc-dev am: 1f4713bd4f -s ours am: f3d9033a9e -s ours 
am skip reason: Change-Id I90c7a8c47710ea4ad8e8d2682c10440fd7f82270 with SHA-1 e408eb55dc is in history

Change-Id: I3367950e4212e7539bce1f25b68830d7ffc04bab
 2020-04-08 08:11:48 +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
62b8f38312 Merge "Add more tests in NetworkCapabilitiesTest.java" into rvc-dev am: 1f4713bd4f 
Change-Id: Iffc785851bd1f84d54ef067ef8e555ba57587b2c
 2020-04-08 07:53:43 +00:00
Lucas Lin
1f4713bd4f Merge "Add more tests in NetworkCapabilitiesTest.java" into rvc-dev 2020-04-08 07:40:30 +00:00