LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,048 Commits 2 Branches 0 Tags
b2c239f7864ba7312551b98ca25e78abbaeec0b4
Commit Graph

10048 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
a15badaf6f Merge "Set transport types to resolver" into rvc-dev am: 89d243c5c3 am: 935dde5458 am: a0e7c8765a am: 8a78ecf2cf 
Change-Id: I3d9f58afdc3d185bb5d3ed5b63e7a42102b72572
 2020-04-11 15:28:24 +00:00
TreeHugger Robot
596cbac15c Merge "Set transport types to resolver" into rvc-dev am: 89d243c5c3 am: 97d89a171a am: 809ddd05f3 am: 03a0cb0dca 
Change-Id: Ibb5fa48d6c50a3f0b74aaec1ddf96608a05addc2
 2020-04-11 15:28:11 +00:00
TreeHugger Robot
8a78ecf2cf Merge "Set transport types to resolver" into rvc-dev am: 89d243c5c3 am: 935dde5458 am: a0e7c8765a 
Change-Id: I49eff59786c2d731d8470ce63a95dbcc76220a71
 2020-04-11 15:20:05 +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
TreeHugger Robot
03a0cb0dca Merge "Set transport types to resolver" into rvc-dev am: 89d243c5c3 am: 97d89a171a am: 809ddd05f3 
Change-Id: Idca5428ae26abf20ea53a8f65dfbd32d1dc4d086
 2020-04-11 15:02:53 +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
4b6c056273 [automerger skipped] Merge "Fix a theoretical NPE" into rvc-dev am: ce6aa16b80 -s ours am: 7509295d18 -s ours am: 5559d7de74 -s ours am: ec3187ed64 -s ours 
am skip reason: Change-Id I08f57cce0cd85d5cd66e9a0ef948224290e9200e with SHA-1 5d8bc4b1ac is in history

Change-Id: Ia2cadc7252162a32f988d1de9c66cb52f3e084b2
 2020-04-11 06:17:15 +00:00
Chalard Jean
f6a2c3175e [automerger skipped] Merge "Fix a theoretical NPE" into rvc-dev am: ce6aa16b80 am: 567ec866ad -s ours am: c7dd81ecac -s ours am: 6710d8fa3a -s ours 
am skip reason: Change-Id I08f57cce0cd85d5cd66e9a0ef948224290e9200e with SHA-1 5d8bc4b1ac is in history

Change-Id: Ic3f73a978b393791f6aadded539d759a6fc276be
 2020-04-11 06:16:33 +00:00
Chalard Jean
ec3187ed64 [automerger skipped] Merge "Fix a theoretical NPE" into rvc-dev am: ce6aa16b80 -s ours am: 7509295d18 -s ours am: 5559d7de74 -s ours 
am skip reason: Change-Id I08f57cce0cd85d5cd66e9a0ef948224290e9200e with SHA-1 5d8bc4b1ac is in history

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

Change-Id: I2e44ddc143a4a390e00bd1b20b663e38ea6c1d47
 2020-04-11 05:55:54 +00: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
edc139757e [automerger skipped] Merge changes from topic "phonestatelistener-limit-rvc-dev" am: 0167936be4 am: a7d042ad64 -s ours am: c1ec9a6d5b -s ours am: c383aa06c6 -s ours am: e47879dcd4 -s ours 
am skip reason: Change-Id I4d6681d90705b68c3349f4124e434a29b50fd3a2 with SHA-1 2ca7c9a422 is in history

Change-Id: I47603e5aeddf1d0cbc57eba12935bda03f07afaa
 2020-04-11 02:02:35 +00:00
Hall Liu
e47879dcd4 [automerger skipped] Merge changes from topic "phonestatelistener-limit-rvc-dev" am: 0167936be4 am: a7d042ad64 -s ours am: c1ec9a6d5b -s ours am: c383aa06c6 -s ours 
am skip reason: Change-Id I4d6681d90705b68c3349f4124e434a29b50fd3a2 with SHA-1 2ca7c9a422 is in history

Change-Id: I05e94a1d4ef9247cad8cff962729d31819b3c25b
 2020-04-11 01:42:23 +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
153b346141 [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 am: f00bd1e40f am: a787e59ba5 -s ours 
am skip reason: subject contains skip directive

Change-Id: Id6726b54c852a05b536d2f653eba5317e87c81b9
 2020-04-10 20:06:53 +00:00
Xin Li
a787e59ba5 [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 am: f00bd1e40f 
Change-Id: I91747ec5175ea6af1f80ddf7ff5da9e1b7be06ff
 2020-04-10 19:46:36 +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
Treehugger Robot
c81633a519 Merge "Fix a theoretical NPE" am: 6334d49d44 am: 92c8e43252 am: c53b4498be am: 0e51f38933 am: 8d2ccfc1dc 
Change-Id: I762e107606d5974b04376711c256fd8758546854
 2020-04-10 19:11:51 +00:00