Commit Graph

41795 Commits

Author SHA1 Message Date
Treehugger Robot
c3ff65a0b8 Merge "import copy of bpf_net_helpers.h from system/netd/bpf_progs" am: 28c51a157c am: b6c38f987f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1733033

Change-Id: I0dea36f0270a493a8a4b5867e07e5e12ac0ec550
2021-06-10 06:18:34 +00:00
Treehugger Robot
b6c38f987f Merge "import copy of bpf_net_helpers.h from system/netd/bpf_progs" am: 28c51a157c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1733033

Change-Id: If7d5655192f64b66a3175bc84ba31585a50848e0
2021-06-10 06:04:58 +00:00
Remi NGUYEN VAN
62f6e19968 Merge "Use shell permission to query current user" am: dbb2a23a38 am: 7252278df7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1730549

Change-Id: I74b82e3ff03f0bc540c5023b4a9af9799915e559
2021-06-10 05:53:29 +00:00
Treehugger Robot
28c51a157c Merge "import copy of bpf_net_helpers.h from system/netd/bpf_progs" 2021-06-10 05:50:16 +00:00
Remi NGUYEN VAN
7252278df7 Merge "Use shell permission to query current user" am: dbb2a23a38
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1730549

Change-Id: I8a019cc8925ae4abc7e64247aa3cef69b558ce3d
2021-06-10 05:36:39 +00:00
Remi NGUYEN VAN
dbb2a23a38 Merge "Use shell permission to query current user" 2021-06-10 05:19:57 +00:00
Maciej Żenczykowski
23f5d805ed import copy of bpf_net_helpers.h from system/netd/bpf_progs
after this:
  diff system/netd/bpf_progs/bpf_net_helpers.h packages/modules/Connectivity/Tethering/bpf_progs/bpf_net_helpers.h
shows no diff, besides a switch to '#pragma once'
as the include guard.

Test: builds, atest, TreeHugger
Bug: 177884581
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ib943321d46254ba64ce206fb9e3b3414d15e4d45
2021-06-09 19:53:13 -07:00
Remi NGUYEN VAN
8e9b20a556 [automerger skipped] Merge "Deprecate MANAGE_ACTIVITY_STACKS permission" am: 45f922a2ff am: f9e22d7f3c -s ours
am skip reason: Merged-In I3c2563d4ae4e3715d0c6270344ba8f7ef067872f with SHA-1 2afd0986d3 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1731235

Change-Id: I4bc77d81a084de087def39025e2812cf4311bb7d
2021-06-10 00:23:28 +00:00
Remi NGUYEN VAN
f9e22d7f3c Merge "Deprecate MANAGE_ACTIVITY_STACKS permission" am: 45f922a2ff
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1731235

Change-Id: I535c12bc058cb3e3782badac38c11ed763236e4c
2021-06-10 00:06:48 +00:00
Treehugger Robot
50918e503c [automerger skipped] Fix restorePrivateDnsSetting with null hostnames am: 7fd2b373ff -s ours
am skip reason: Merged-In Ic5d8d8b729469e0eef89a0b53f166e604264c1ee with SHA-1 908b002ed2 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14911838

Change-Id: I60705cb9b8c95a156ea9e6c7bd22c2998c9885ed
2021-06-10 00:05:44 +00:00
Remi NGUYEN VAN
45f922a2ff Merge "Deprecate MANAGE_ACTIVITY_STACKS permission" 2021-06-09 23:45:29 +00:00
Treehugger Robot
5fe9b7bcbe Merge "Skip CaptivePortalTest for wearables" am: 3a1a22b82a am: b931a1f392
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727591

Change-Id: I69fce78c69b847fc7dded60f1c293f0dcc7e8733
2021-06-09 19:29:37 +00:00
Treehugger Robot
b931a1f392 Merge "Skip CaptivePortalTest for wearables" am: 3a1a22b82a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727591

Change-Id: Iaca1c0ae1db503c0f025af737cc83ce60f4ab7e2
2021-06-09 18:42:59 +00:00
Treehugger Robot
3a1a22b82a Merge "Skip CaptivePortalTest for wearables" 2021-06-09 17:59:04 +00:00
Frank Li
c1ea6b691f Merge "Add CTS test for NetworkAgent/NetworkAgentConfig API" am: 99e50a0fc9 am: e803a53246
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1693668

Change-Id: If7ddb3f87320a91e1cdda33c99f108c32a760b6d
2021-06-09 12:42:02 +00:00
Frank Li
e803a53246 Merge "Add CTS test for NetworkAgent/NetworkAgentConfig API" am: 99e50a0fc9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1693668

Change-Id: Ib650541c2ff86c0055d97b7dd2d86965126a26f2
2021-06-09 12:28:08 +00:00
Frank Li
99e50a0fc9 Merge "Add CTS test for NetworkAgent/NetworkAgentConfig API" 2021-06-09 12:12:05 +00:00
Treehugger Robot
4c22076ae4 Merge "Improve handling of invalid private DNS settings" am: b80e88d604 am: 67bb33e5cc
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1730543

Change-Id: I735561c48510ff5d4771888d815d7a336f4ccea7
2021-06-09 11:30:08 +00:00
Treehugger Robot
67bb33e5cc Merge "Improve handling of invalid private DNS settings" am: b80e88d604
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1730543

Change-Id: Iddbe866b7df7dbb93f1e6d4cef95ee6e01739abe
2021-06-09 11:09:35 +00:00
Treehugger Robot
b80e88d604 Merge "Improve handling of invalid private DNS settings" 2021-06-09 10:52:14 +00:00
Remi NGUYEN VAN
95bc8d7067 Use shell permission to query current user
Use shell permissions to obtain CREATE_USERS to call
ActivityManager.getCurrentUser in ConnectivityServiceTest.

This is necessary to allow the tests to run in coverage tests without
the platform certificate.

Bug: 187935317
Test: atest FrameworksNetTests:ConnectivityServiceTest
Change-Id: I5a56ffab4820d351dcdb132046698cd0d3b8bdb1
2021-06-09 19:28:16 +09:00
Remi NGUYEN VAN
f900c45afa Deprecate MANAGE_ACTIVITY_STACKS permission
This is a partial cherry-pick of change:
I894ee66e058b1024a731d3be4b33b69626451f08

The permission is actually not used, but this change aligns the manifest
with contents in downstream branches, so it can be modified (including
removing the permission) without conflicts.

Bug: 157876448
Test: atest FrameworksNetTests
Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f
Change-Id: Id50e41a0ea970350eae0a2afab303c022b452bf9
2021-06-09 19:28:10 +09:00
Treehugger Robot
7fd2b373ff Fix restorePrivateDnsSetting with null hostnames
When private DNS setting was set to opportunistic (mode) and null
(hostname), CtsNetUtils would not restore it.

Make sure that private DNS settings are restored after every test. Also
fail if restore is called without having saved any setting beforehand.

Bug: 190465704
Test: atest CtsNetTestCases
Original-Change: https://android-review.googlesource.com/1729162
Merged-In: Ic5d8d8b729469e0eef89a0b53f166e604264c1ee
Change-Id: Ic5d8d8b729469e0eef89a0b53f166e604264c1ee
2021-06-09 10:05:18 +00:00
lifr
561547a537 Add CTS test for NetworkAgent/NetworkAgentConfig API
The following is a list of APIs:
1. NetworkAgent.setLegacySubtype
2. NetworkAgentConfig.Builder.setLegacySubType
3. NetworkAgentConfig.Builder.setLegacySubTypeName
4. NetworkAgentConfig.Builder.setLegacyExtraInfo

Bug: 190413710
Test: atest android.net.cts.NetworkAgentTest
      atest CtsNetTestCasesLatestSdk:NetworkAgentTest
Change-Id: Ia67b963b8e18af8440b1b9bd91f53439848bb838
2021-06-09 17:31:23 +08:00
Remi NGUYEN VAN
e4fa2ac5ac Merge "Remove ConnectivityServiceTest signature perms use" am: 545f6cf95f am: 4c21d6c2a6
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727819

Change-Id: I7f2a05be80117dad19b5e7fafb71f562466096f9
2021-06-09 09:15:06 +00:00
Remi NGUYEN VAN
4b6239c2c8 Merge "Use mockito-extended in FrameworksNetTests" am: 35e6108119 am: 98ea169c22
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727825

Change-Id: I0fb914110ec6e2c34544831619157f05a8e57661
2021-06-09 09:14:57 +00:00
Remi NGUYEN VAN
4c21d6c2a6 Merge "Remove ConnectivityServiceTest signature perms use" am: 545f6cf95f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727819

Change-Id: Id60ce478abe26c82f79bdce0b025e9629cdd0d89
2021-06-09 08:54:47 +00:00
Remi NGUYEN VAN
98ea169c22 Merge "Use mockito-extended in FrameworksNetTests" am: 35e6108119
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727825

Change-Id: Ied36d4711c9c12d0991c00c28a78931ae3ea58f9
2021-06-09 08:54:38 +00:00
Remi NGUYEN VAN
545f6cf95f Merge "Remove ConnectivityServiceTest signature perms use" 2021-06-09 08:39:33 +00:00
Remi NGUYEN VAN
35e6108119 Merge "Use mockito-extended in FrameworksNetTests" 2021-06-09 08:39:24 +00:00
Junyu Lai
58058998db [automerger skipped] Merge changes from topic "cts-snapshots" am: 07f97b249c am: fd242c77b1 -s ours
am skip reason: Merged-In I90d47ac9bd0570c0aed19402fa9be4e99e0f8621 with SHA-1 056b6649cd is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727822

Change-Id: Iaf7247b1fd065b90ee35858672c263e41b6bd1e7
2021-06-09 08:33:47 +00:00
junyulai
92333ed77f [automerger skipped] Add CTS for getAllNetworkStateSnapshots am: cfefdea403 am: ccebee1ece -s ours
am skip reason: Merged-In I573b009bd05bbc0c855aaa6e20cb8ebde6729936 with SHA-1 3a64e80dee is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1708091

Change-Id: I18cb581ff57498561b969fa3c17d126f797dde7f
2021-06-09 08:33:46 +00:00
junyulai
c559f4a4ac [automerger skipped] Check NETWORK_SETTINGS permission for getAllNetworkStateSnapshots am: eaaacb0d47 am: 1c2ffd5329 -s ours
am skip reason: Merged-In I3c2563d4ae4e3715d0c6270344ba8f7ef067872f with SHA-1 2afd0986d3 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1730542

Change-Id: I37eb436b3a148cbcca48a41d333f5c8d9b64457f
2021-06-09 08:33:45 +00:00
Lorenzo Colitti
7d9f43c6f3 Merge "Don't send onLinkPropertiesChanged after onLost for 464xlat." am: a3f12dd52c am: b4e1b65298
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727829

Change-Id: Iad96cfcdd5f385c084be76b3b25ffd10b080df7f
2021-06-09 08:33:36 +00:00
Lorenzo Colitti
97adf6a8b4 Merge "Improve test coverage for disconnecting networks with clat." am: f55fa638c8 am: 7e79954915
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1729093

Change-Id: Idf372d6f3305d6678837d36ce901af8ac482ea58
2021-06-09 08:33:31 +00:00
Junyu Lai
fd242c77b1 Merge changes from topic "cts-snapshots" am: 07f97b249c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727822

Change-Id: I0fc00956cc8891e45bb2b76f6e35063949d5f0ba
2021-06-09 08:16:01 +00:00
junyulai
ccebee1ece Add CTS for getAllNetworkStateSnapshots am: cfefdea403
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1708091

Change-Id: I8217f4e4c0de2de5f12066e567f56c0f5432d9f7
2021-06-09 08:15:58 +00:00
junyulai
1c2ffd5329 Check NETWORK_SETTINGS permission for getAllNetworkStateSnapshots am: eaaacb0d47
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1730542

Change-Id: I8f5e007749baa057f1a5a231736d7038fb69204f
2021-06-09 08:15:55 +00:00
Lorenzo Colitti
b4e1b65298 Merge "Don't send onLinkPropertiesChanged after onLost for 464xlat." am: a3f12dd52c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727829

Change-Id: I1e42216dc10552861253f719d1178e3143ac83c3
2021-06-09 08:14:54 +00:00
Lorenzo Colitti
7e79954915 Merge "Improve test coverage for disconnecting networks with clat." am: f55fa638c8
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1729093

Change-Id: Ieb08904445cabf01ed5ba6f4543699a1585fda50
2021-06-09 08:14:44 +00:00
TreeHugger Robot
f216aa9fa7 [automerger skipped] Merge "Fix TetheringTest crash on eng build" into sc-dev am: f15137fb9f -s ours
am skip reason: Merged-In I61f6088783d521fd17ae1e87370842b4239fbe75 with SHA-1 7ba566dbf7 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14637501

Change-Id: Ia40558871b1ea9ea4ae8ca23501f407c3046589e
2021-06-09 08:13:10 +00:00
Junyu Lai
07f97b249c Merge changes from topic "cts-snapshots"
* changes:
  Add CTS for NetworkAgentConfig#setSubscriberId
  Add CTS for getAllNetworkStateSnapshots
  Check NETWORK_SETTINGS permission for getAllNetworkStateSnapshots
2021-06-09 08:09:41 +00:00
Lorenzo Colitti
a3f12dd52c Merge "Don't send onLinkPropertiesChanged after onLost for 464xlat." 2021-06-09 07:59:25 +00:00
Lorenzo Colitti
f55fa638c8 Merge "Improve test coverage for disconnecting networks with clat." 2021-06-09 07:59:13 +00:00
TreeHugger Robot
f15137fb9f Merge "Fix TetheringTest crash on eng build" into sc-dev 2021-06-09 07:57:25 +00:00
Treehugger Robot
8c2b394c6f Merge "Fix restorePrivateDnsSetting with null hostnames" am: 0103375187 am: eea4b37228
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1729162

Change-Id: Iacfcb44374664b60f35f48749100dae83c54dfaf
2021-06-09 06:18:23 +00:00
Treehugger Robot
eea4b37228 Merge "Fix restorePrivateDnsSetting with null hostnames" am: 0103375187
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1729162

Change-Id: I604e6d94640f36b37a628aa77e6df0fb709e2d85
2021-06-09 06:06:13 +00:00
Treehugger Robot
0103375187 Merge "Fix restorePrivateDnsSetting with null hostnames" 2021-06-09 05:45:24 +00:00
Remi NGUYEN VAN
c2303139ef Improve handling of invalid private DNS settings
When private DNS mode is strict, there should always be a private DNS
specifier with the hostname.

Instead of restoring an invalid strict mode setting when set,
have tests reset private DNS mode to opportunistic and fail.

Bug: 190465704
Test: atest CtsNetTestCases
Change-Id: I45adc527267aa86d52e824f426699c5a7e874f63
2021-06-09 14:42:00 +09:00
Remi NGUYEN VAN
d7426b8a44 [automerger skipped] Merge changes from topic "conn_test_defaults_cp" am: de3c20ecb5 am: 99fadb7b70 -s ours
am skip reason: Merged-In I3c2563d4ae4e3715d0c6270344ba8f7ef067872f with SHA-1 2afd0986d3 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1729164

Change-Id: I6b3f89ee35fcf5ecaa11fbb3d8fe644b87ede58d
2021-06-09 01:58:35 +00:00